diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index 8248277f3c..b537f01a8b 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1155,17 +1155,23 @@
     <P1359></P1359>
     <!--  HTTP/HTTPS User Name -->
     <!--  String -->
-    <P1360></P1360>
+    <P1360>{$http_auth_username}</P1360>
     <!--  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>