diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index df034cd09d..48eceecc19 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -1889,19 +1889,25 @@
     <!-- XML Config File Password -->
     <!-- String -->
     <P1359></P1359>
-    <!-- HTT/PHTTPS User Name -->
+    <!-- HTTP/HTTPS User Name -->
     <!-- String -->
-    <P1359></P1359>
-    <!-- HTT/PHTTPS Password -->
+    <P1359>{$http_auth_username}</P1359>
+    <!-- HTTP/HTTPS Password -->
     <!-- String -->
-    <P1361></P1361>
+    <P1361>{$http_auth_password}</P1361>
     <!-- Firmware Upgrade Via. 0 - TFTP Upgrade,  1 - HTTP Upgrade, 2 - HTTPS Upgrade. Default is 1 -->
     <!-- Number: 0, 1, 2 -->
     <!-- Mandatory -->
     <P212>2</P212>
     <!-- Firmware Server Path -->
     <!-- String -->
-    <P192>fm.grandstream.com/gs</P192>
+    
+    {if isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}</P192>
+    {else}
+    <P192>{$domain_name}{$project_path}/app/provision</P192>
+    {/if}
+    
     <!-- Config Server Path -->
     <!-- String -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>