diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index b71061852e..4e0f2a53c8 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -73,7 +73,7 @@
{$domain_name}{$project_path}/app/provision
-{$http_auth_password}
+
{$http_auth_username}
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index af8d407791..1e5e44e9d7 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -38,7 +38,7 @@
{$domain_name}{$project_path}/app/provision
- {$http_auth_password}
+
{$http_auth_username}
diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index b146738c14..da63c57dce 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -2632,7 +2632,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index 5932a04be9..b0ad49c720 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -904,7 +904,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index dab9f4e550..53d1a7256f 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -778,7 +778,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index d668db898f..b537f01a8b 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1152,7 +1152,7 @@
0
- {$http_auth_password}
+
{$http_auth_username}
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index f6ddca07a8..4c61bc0013 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1152,7 +1152,7 @@
0
- {$http_auth_password}
+
{$http_auth_username}
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index 5f172f5367..1d9f08d457 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -1533,7 +1533,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index 002ca414bf..033c52e9f8 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1342,7 +1342,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index 4ba8c3a825..24113aa9e4 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -2033,7 +2033,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index 5035edecb8..602e9fe516 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -6042,7 +6042,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index d4c4f2fd2c..5cc4c6d7df 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -1889,7 +1889,7 @@
- {$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 2282a41f7b..9f210aada2 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -4848,7 +4848,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 6f6d1dea28..dd15082533 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -4848,7 +4848,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 6f6d1dea28..dd15082533 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -4848,7 +4848,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index e84eac318a..eb8a5aca76 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -2681,7 +2681,7 @@
0
- {$http_auth_password}
+
{$http_auth_username}
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 0df63ec9b5..208f231fce 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -17,7 +17,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 326e9e984e..ac29bc6e1e 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3198,7 +3198,7 @@ Account 5 Codec Settings
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index f6729e561f..9b543b57ff 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -3198,7 +3198,7 @@ Account 5 Codec Settings
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
index 9e6b2d2a3e..46098c7e5f 100644
--- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
@@ -1361,7 +1361,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
index b84b39c013..993bf4f8b0 100644
--- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
@@ -1241,7 +1241,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
index 4393c2e7e6..6481ce5c10 100644
--- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
@@ -740,7 +740,7 @@
- {$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index 7e8f31b9b0..8a26fc6767 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -4793,7 +4793,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index 4e339065b3..26dcbaa350 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -3198,7 +3198,7 @@ Account 5 Codec Settings
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
index 649b8fa7d6..322f465a58 100644
--- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
@@ -585,7 +585,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index 9a56424e68..c42e205cab 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -62,7 +62,7 @@
- {$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index 402143dcc8..c20e7422fd 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -153,7 +153,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 5b77f7d685..a36e13d687 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -47,7 +47,7 @@
{$domain_name}{$project_path}/app/provision
- {$http_auth_password}
+
{$http_auth_username}
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index 6ef8ee0eb1..5c2fd06630 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -147,7 +147,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index 76f63fb5f4..88ce52dabe 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -75,7 +75,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 3337656545..e65bcc0dcb 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -83,7 +83,7 @@
-{$http_auth_password}
+
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 30cc2eaf6a..14b34d0287 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -79,7 +79,7 @@
-{$http_auth_password}
+