diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index a0c3f1cc8a..9a56424e68 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -49,23 +49,28 @@
     <!-- Number: 0 to 2 -->
     <!-- Mandatory -->
     <P212>2</P212>
-    <!-- Firmware Server Path -->
-    <!-- String: serveraddress  -->
-    <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: serveraddress  -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     <!-- XML Config File Password -->
     <!-- String Max Length: 40 -->
-    <!-- Mandatory; between ascii values 33 and 126 -->
-    <P1359></P1359>
-    <!-- HTTP/HTTPS User Name -->
-    <!-- String Max Length: 40; between ascii values 33 and 126 -->
-    <P1360></P1360>
-    <!-- HTTP/HTTPS Password -->
-    <!-- String Max Length: 40; between ascii values 33 and 126 -->
+    <!-- XML Config File Password -->
+    <!-- String; between ascii values 33 and 126 -->
     <!-- Mandatory -->
-    <P1361></P1361>
+    <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 File Prefix -->
     <!-- String Max Length: 32; between ascii values 33 and 126 -->
     <P232></P232>
@@ -2976,4 +2981,4 @@
     <!-- Mandatory -->
     <P181></P181>
   </config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>