diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 09ad1e6c8f..b84d834aca 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3199,17 +3199,22 @@ Account 5 Codec Settings
 <P1359></P1359>
 
 <!-- HTTP/HTTPS User Name -->
-<P1360></P1360>
+<P1360>{$http_auth_username}</P1360>
 
 <!-- HTTP/HTTPS Password -->
-<P1361></P1361>
+<P1361>{$http_auth_password}</P1361>
 
 <!-- Upgrade Via. 0 - TFTP, 1 - HTTP, 2 - HTTPS, 3 - Manual Upload. Default value is 1 -->
 <!-- Number: 0, 1, 2, 3 -->
 <P212>2</P212>
 
 <!-- Firmware Server Path -->
-<P192>fw.ipvideotalk.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 -->
 <P237>{$domain_name}{$project_path}/app/provision</P237>