diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 17a6a3ac75..26e5c8cacc 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -40,15 +40,23 @@
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 		<P212>2</P212>
 		<!-- Firmware Server Path -->
-    {if isset($grandstream_firmware_path) && isset($firmware_version)}
-    <P192>{$grandstream_firmware_path}/ht502/{$firmware_version}</P192>
-    {elseif isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}/ht502</P192>
-    {else}
-    <P192>{$domain_name}{$project_path}/app/provision</P192>
-    {/if}
+                {if isset($grandstream_firmware_path) && isset($firmware_version)}
+                <P192>{$grandstream_firmware_path}/ht502/{$firmware_version}</P192>
+                {elseif isset($grandstream_firmware_path)}
+                <P192>{$grandstream_firmware_path}/ht502</P192>
+                {else}
+                <P192>{$domain_name}{$project_path}/app/provision</P192>
+                {/if}
+		
 		<!-- Config Server Path. Server address -->
-		<P237>{$domain_name}{$project_path}/app/provision</P237>
+                {if $grandstream_config_server_path=="none"}
+                <P237></P237>
+                {elseif isset($grandstream_config_server_path)}
+                <P237>{$grandstream_config_server_path}</P237>
+                {else}
+                <P237>{$domain_name}{$project_path}/app/provision</P237>
+                {/if}
+		
 		<!-- XML Config File Password. Max Length: 40 characters; between ascii values 33 and 126 -->
 		<P1359></P1359>
 		<!-- HTTP/HTTPS User Name. Max Length: 40 characters; between ascii values 33 and 126 -->