diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 48eceecc19..d4c4f2fd2c 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -1887,13 +1887,16 @@
     <!-- Mandatory -->
     <P238>0</P238>
     <!-- XML Config File Password -->
-    <!-- String -->
-    <P1359></P1359>
-    <!-- HTTP/HTTPS User Name -->
-    <!-- String -->
-    <P1359>{$http_auth_username}</P1359>
-    <!-- HTTP/HTTPS Password -->
-    <!-- String -->
+    <!-- String; between ascii values 33 and 126 -->
+    <!-- Mandatory -->
+    <P1359>{$http_auth_password}</P1359>
+
+    <!--  HTTP/HTTPS User Name -->
+    <!--  String; between ascii values 33 and 126 -->
+    <P1360>{$http_auth_username}</P1360>
+
+    <!--  HTTP/HTTPS Password -->
+    <!--  String; between ascii values 33 and 126 -->
     <P1361>{$http_auth_password}</P1361>
     <!-- Firmware Upgrade Via. 0 - TFTP Upgrade,  1 - HTTP Upgrade, 2 - HTTPS Upgrade. Default is 1 -->
     <!-- Number: 0, 1, 2 -->