diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index ccf4ae7baf..5b77f7d685 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -39,12 +39,15 @@
 	<!-- Firmware Upgrade -->
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 		<P212>2</P212>
-		<!-- Firmware Server Path. Server address -->
-		<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. Server address -->
 		<P237>{$domain_name}{$project_path}/app/provision</P237>
 		<!-- XML Config File Password. Max Length: 40 characters; between ascii values 33 and 126 -->
-		<P1359></P1359>
+		<P1359>{$http_auth_password}</P1359>
 		<!-- HTTP/HTTPS User Name. Max Length: 40 characters; between ascii values 33 and 126 -->
 		<P1360>{$http_auth_username}</P1360>
 		<!-- HTTP/HTTPS Password. Max Length: 40 characters; between ascii values 33 and 126 -->