diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
index d0010f16ef..a06dee53af 100644
--- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
@@ -16,26 +16,29 @@
     <!-- # Number: 0, 1 -->
     <P271>1</P271>
 
-    <!-- # Account Name -->
-    <P270>{$display_name_1}</P270>
+    <!--  Account Name -->
+    <!--  String -->
+    <P270>{$account.1.display_name}</P270>
 
-    <!-- # SIP Server -->
-    <P47>{$server_address_1}</P47>
+    <!--  SIP Server -->
+    <!--  String -->
+    <P47>{$account.1.server_address}</P47>
 
     <!-- # SIP User ID -->
-    <P35>99</P35>
+    <P35>{$account.1.user_id}</P35>
     <!--   -->
     <!-- # SIP Authentication ID -->
-    <P36>99</P36>
+    <P36>{$account.1.auth_id}</P36>
 
-    <!-- # SIP Authentication Password -->
-    <P34>{$user_password_1}</P34>
+    <!--  Authenticate Password -->
+    <!--  String -->
+    <P34>{$account.1.password}</P34>
 
     <!-- # Voice Mail Access Number -->
     <P33>*97</P33>
 
     <!-- # Name (Display Name, e.g., John Doe) -->
-    <P3>{$display_name_1}</P3>
+    <P3>{$account.1.display_name}</P3>
 
     <!-- # Show Account Name Only. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -50,10 +53,10 @@
     <!-- ####################################################################### -->
 
     <!-- # Outbound Proxy -->
-    <P48></P48>
+    <P48>{$account.1.outbound_proxy_primary}</P48>
 
     <!-- # Secondary Outbound Proxy -->
-    <P2333></P2333>
+    <P2333>{$account.1.server_address_secondary}</P2333>
 
     <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
@@ -92,7 +95,7 @@
 
     <!-- # Register Expiration (m). In minutes. Default value is 60 -->
     <!-- # Number: 0 - 64800 -->
-    <P32>{$register_expires_1}</P32>
+    <P32>{$account.1.register_expires}</P32>
 
     <!-- # Re-register before Expiration (s). Default Value is 0 -->
     <!-- # Number : 0 -->
@@ -181,15 +184,15 @@
     <!-- # Number: 0, 1, 2 -->
     <P2339>0</P2339>
 
-    <!-- # SIP Transport -->
-    <!-- # 0 - UDP , 1 - TCP, 2 - TLS. Default value is 0 -->
+    <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS/TCP. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     {$tp=0}
-	{if $sip_transport_1 == 'udp'}{$tp=0}{/if}
-	{if $sip_transport_1 == 'tcp'}{$tp=1}{/if}
-	{if $sip_transport_1 == 'tls'}{$tp=2}{/if}
-	{if $sip_transport_1 == 'dns srv'}{$tp=1}{/if}
-	<P130>{$tp}</P130>
+    {if $account.1.sip_transport == 'udp'}{$tp=0}{/if}
+    {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if}
+    {if $account.1.sip_transport == 'tls'}{$tp=2}{/if}
+    {if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if}
+    <P130>{$tp}</P130>
+
     <!-- # SIP URI Scheme When Using TLS -->
     <!-- # 0 -sip, 1 - sips. Default value is 0. -->
     <!-- # Number: 0, 1 -->
@@ -591,30 +594,30 @@
 
     <!-- # Account Activation. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
-    {if isset($user_password_2)}
+    {if isset($account.2.password)}
 	<P401>1</P401>
 	{else}
 	<P401>0</P401>
 	{/if}
     <!-- # Account Name -->
-    <P417>{$display_name_2}</P417>
+    <P417>{$account.2.display_name}</P417>
 
     <!-- # SIP Server -->
-    <P402>{$server_address_2}</P402>
+    <P402>{$account.2.server_address}</P402>
 
     <!-- # SIP User ID -->
-    <P404>{$user_id_2}</P404>
+    <P404>{$account.2.user_id}</P404>
 
     <!-- # SIP Authenticate ID -->
-    <P405>{$auth_id_2}</P405>
+    <P405>{$account.2.auth_id}</P405>
 
     <!-- # SIP Authenticate Password -->
-    <P406>{$user_password_2}</P406>
+    <P406>{$account.2.password}</P406>
 
     <!-- # Voice Mail UserID -->
     <P426>*97</P426>
     <!-- # Name (Display name, e.g., John Doe) -->
-    <P407>{$display_name_2}</P407>
+    <P407>{$account.2.display_name}</P407>
 
     <!-- # Show Account Name Only. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -629,10 +632,10 @@
     <!-- ####################################################################### -->
 
     <!-- # Outbound Proxy -->
-    <P403>{$outbound_proxy_2}</P403>
+    <P403>{$account.2.outbound_proxy}</P403>
 
     <!-- # Secondary Outbound Proxy -->
-    <P2433></P2433>
+    <P2433>{$account.2.outbound_proxy_secondary}</P2433>
 
     <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
@@ -671,7 +674,7 @@
 
     <!-- # Register Expiration (m). In minutes. Default value is 60 -->
     <!-- # Number: 0 - 64800 -->
-    <P412>{$register_expires_2}</P412>
+    <P412>{$account.2.register_expires}</P412>
 
     <!-- # Register before Expiration (s). Default value is 0 -->
     <!-- # Number -->
@@ -760,11 +763,11 @@
     <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
    	{$tp=0}
-	{if $sip_transport_2 == 'udp'}{$tp=0}{/if}
-	{if $sip_transport_2 == 'tcp'}{$tp=1}{/if}
-	{if $sip_transport_2 == 'tls'}{$tp=2}{/if}
-	{if $sip_transport_2 == 'dns srv'}{$tp=1}{/if}
-	<P448>{$tp}</P448>
+    {if $account.2.sip_transport == 'udp'}{$tp=0}{/if}
+    {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if}
+    {if $account.2.sip_transport == 'tls'}{$tp=2}{/if}
+    {if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if}
+    <P448>{$tp}</P448>
 
     <!-- # SIP URI Scheme When Using TLS -->
     <!-- # 0 -sip, 1 - sips. Default value is 0. -->
@@ -971,7 +974,12 @@
     <P2482>0</P2482>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ | x+*x+*x+*x+ | x+*x+*x+*x+#x+ } -->
+    
+    {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
+    {else}
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -1150,23 +1158,23 @@
 
     <!-- # Account Activation. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
-    {if isset($user_password_3)}
+    {if isset($account.3.password)}
 	<P501>1</P501>
 	{else}
 	<P501>0</P501>
 	{/if}
 
     <!-- # Account Name -->
-    <P517>{$display_name_3}</P517>
+    <P517>{$account.3.display_name}</P517>
 
     <!-- # SIP Server -->
-    <P502>{$server_address_3}</P502>
+    <P502>{$account.3.server_address}</P502>
 
     <!-- # SIP User ID -->
-    <P504>{$user_id_3}</P504>
+    <P504>{$account.3.user_id}</P504>
 
     <!-- # SIP Authenticate ID -->
-    <P505>{$auth_id_3}</P505>
+    <P505>{$account.3.auth_id}</P505>
 
     <!-- # SIP Authenticate Password -->
     <P506>{$user_password_3}</P506>
@@ -1175,7 +1183,7 @@
     <P526>*97</P526>
 
     <!-- # Name (Display name: John Doe) -->
-    <P507>{$display_name_3}</P507>
+    <P507>{$account.3.display_name}</P507>
 
     <!-- # Show Account Name Only. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -1190,10 +1198,10 @@
     <!-- ####################################################################### -->
 
     <!-- # Outbound Proxy -->
-    <P503>{$outbound_proxy_3}</P503>
+    <P503>{$account.3.outbound_proxy}</P503>
 
     <!-- # Secondary Outbound Proxy -->
-    <P2533></P2533>
+    <P2533>{$account.3.outbound_proxy_secondary}</P2533>
 
     <!-- # DNS Mode  0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default is 0 -->
     <!-- # Number: 0, 1, 2. -->
@@ -1232,7 +1240,7 @@
 
     <!-- # Register Expiration (m). In minutes. Default value is 60 -->
     <!-- # Number: 0 - 64800 -->
-    <P512>{$register_expires_3}</P512>
+    <P512>{$account.3.register_expires}</P512>
 
     <!-- # Register before Expiration (s). Default value is 0 -->
     <!-- # Number -->
@@ -1321,11 +1329,11 @@
     <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
     {$tp=0}
-	{if $sip_transport_3 == 'udp'}{$tp=0}{/if}
-	{if $sip_transport_3 == 'tcp'}{$tp=1}{/if}
-	{if $sip_transport_3 == 'tls'}{$tp=2}{/if}
-	{if $sip_transport_3 == 'dns srv'}{$tp=1}{/if}
-	<P548>{$tp}</P548>
+    {if $account.3.sip_transport == 'udp'}{$tp=0}{/if}
+    {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if}
+    {if $account.3.sip_transport == 'tls'}{$tp=2}{/if}
+    {if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if}
+    <P548>{$tp}</P548>
 
     <!-- # SIP URI Scheme When Using TLS -->
     <!-- # 0 -sip, 1 - sips. Default value is 0. -->
@@ -1534,7 +1542,12 @@
     <P2582>0</P2582>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ | x+*x+*x+*x+ | x+*x+*x+*x+#x+ } -->
-  	<P559>{$grandstream_dial_plan}</P559>
+  	
+    {if isset($grandstream_dial_plan) }
+    <P559>{$grandstream_dial_plan}</P559>
+    {else}
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -1713,32 +1726,32 @@
 
     <!-- # Account Activation. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
-   	{if isset($user_password_4)}
+   	{if isset($account.4.password)}
 	<P601>1</P601>
 	{else}
 	<P601>0</P601>
 	{/if}
 
     <!-- # Account Name -->
-    <P617>{$display_name_4}</P617>
+    <P617>{$account.4.display_name}</P617>
 
     <!-- # SIP Server -->
-    <P602>{$server_address_4}</P602>
+    <P602>{$account.4.server_address}</P602>
 
     <!-- # SIP User ID -->
-    <P604>{$user_id_4}</P604>
+    <P604>{$account.4.user_id}</P604>
 
     <!-- # SIP Authenticate ID -->
-    <P605>{$auth_id_4}</P605>
+    <P605>{$account.4.auth_id}</P605>
 
     <!-- # SIP Authenticate Password -->
-    <P606>{$user_password_4}</P606>
+    <P606>{$account.4.password}</P606>
 
     <!-- # Voice Mail UserID -->
     <P626>*97</P626>
 
     <!-- # Name (Display Name, e.g., John Doe) -->
-    <P607>{$display_name_4}</P607>
+    <P607>{$account.4.display_name}</P607>
 
     <!-- # Show Account Name Only. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -1756,7 +1769,7 @@
     <P603>{$outbound_proxy_4}</P603>
 
     <!-- # Secondary Outbound Proxy -->
-    <P2633></P2633>
+    <P2633>{$account.4.outbound_proxy_secondary}</P2633>
 
     <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
@@ -1795,7 +1808,7 @@
 
     <!-- # Register Expiration (m). In minutes. Default value is 60 -->
     <!-- # Number: 0 - 64800 -->
-    <P612>{$register_expires_4}</P612>
+    <P612>{$account.4.register_expires}</P612>
 
     <!-- # Register before Expiration (s). Default value is 0 -->
     <!-- # Number -->
@@ -1885,11 +1898,11 @@
     <!-- # SIP Transport. 0 - UDP , 1 - TCP, 2 - TLS. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
     {$tp=0}
-	{if $sip_transport_4 == 'udp'}{$tp=0}{/if}
-	{if $sip_transport_4 == 'tcp'}{$tp=1}{/if}
-	{if $sip_transport_4 == 'tls'}{$tp=2}{/if}
-	{if $sip_transport_4 == 'dns srv'}{$tp=1}{/if}
-	<P648>{$tp}</P648>
+	{if $account.4.sip_transport == 'udp'}{$tp=0}{/if}
+	{if $account.4.sip_transport == 'tcp'}{$tp=1}{/if}
+	{if $account.4.sip_transport == 'tls'}{$tp=2}{/if}
+	{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if}
+    <P648>{$tp}</P648>
 
     <!-- # SIP URI Scheme When Using TLS -->
     <!-- # 0 -sip, 1 - sips. Default value is 0. -->
@@ -2098,7 +2111,12 @@
 
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ | x+*x+*x+*x+ | x+*x+*x+*x+#x+ } -->
+    
+    {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
+    {else}
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -2175,7 +2193,10 @@
     <P2618></P2618>
 
     <!-- # Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
-    <P623>content://settings/system/ringtone</P623>
+    
+    {if isset($grandstream_account_ring_tone_4)}
+    <P623>{$grandstream_account_ring_tone_4}</P623>
+    {/if}
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120 -->
@@ -2278,31 +2299,31 @@
 
     <!-- # Account Activation. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
-   	{if isset($user_password_5)}
+   	{if isset($account.5.password)}
 	<P1701>1</P1701>
 	{else}
 	<P1701>0</P1701>
 
     <!-- # Account Name -->
-    <P1717>{$display_name_5}</P1717>
+    <P1717>{$account.5.display_name}</P1717>
 
     <!-- # SIP Server -->
-    <P1702>{$server_address_5}</P1702>
+    <P1702>{$account.5.server_address}</P1702>
 
     <!-- # SIP User ID -->
-    <P1704>{$user_id_5}</P1704>
+    <P1704>{$account.5.user_id}</P1704>
 
     <!-- # SIP Authenticate ID -->
-    <P1705>{$auth_id_5}</P1705>
+    <P1705>{$account.5.auth_id}</P1705>
 
     <!-- # SIP Authenticate Password -->
-    <P1706>{$user_password_5}</P1706>
+    <P1706>{$account.5.password}</P1706>
 
     <!-- # Voice Mail UserID -->
     <P1726>*97</P1726>
 
     <!-- # Name (Display name, e.g., John Doe) -->
-    <P1707>{$display_name_5}</P1707>
+    <P1707>{$account.5.display_name}</P1707>
 
     <!-- # Show Account Name Only. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -2317,10 +2338,10 @@
     <!-- ####################################################################### -->
 
     <!-- # Outbound Proxy -->
-    <P1703>{$outbound_proxy_5}</P1703>
+    <P1703>{$account.5.outbound_proxy}</P1703>
 
     <!-- # Secondary Outbound Proxy -->
-    <P2733></P2733>
+    <P2733>{$account.5.outbound_proxy_secondary}</P2733>
 
     <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default value is 0 -->
     <!-- # Number: 0, 1, 2. -->
@@ -2359,7 +2380,7 @@
 
     <!-- # Register Expiration (m). In minutes. Default value is 60 -->
     <!-- # Number: 0 - 64800 -->
-    <P1712>{$register_expires_5}</P1712>
+    <P1712>{$account.5.register_expires}</P1712>
 
     <!-- # Register before Expiration (s). Default value is 0 -->
     <!-- # Number -->
@@ -2446,12 +2467,13 @@
 
     <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
+
     {$tp=0}
-	{if $sip_transport_5 == 'udp'}{$tp=0}{/if}
-	{if $sip_transport_5 == 'tcp'}{$tp=1}{/if}
-	{if $sip_transport_5 == 'tls'}{$tp=2}{/if}
-	{if $sip_transport_5 == 'dns srv'}{$tp=1}{/if}
-	<P1748>{$tp}</P1748>
+	{if $account.5.sip_transport == 'udp'}{$tp=0}{/if}
+	{if $account.5.sip_transport == 'tcp'}{$tp=1}{/if}
+	{if $account.5.sip_transport == 'tls'}{$tp=2}{/if}
+	{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if}
+    <P1748>{$tp}</P1748>
 
     <!-- # SIP URI Scheme When Using TLS -->
     <!-- # 0 -sip, 1 - sips. Default value is 0. -->
@@ -2659,7 +2681,12 @@
     <P2782>0</P2782>
 
     <!-- # Dial Plan Maxlength: unlimited, default is allow all { x+ | \+x+ | *x+ | *xx*x+ | x+*x+*x+*x+ | x+*x+*x+*x+#x+ } -->
+    
+    {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
+    {else}
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -2839,26 +2866,26 @@
 
     <!-- # Account Activation. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
-    {if isset($user_password_6)}
+    {if isset($account.6.password)}
 	<P1801>1</P1801>
 	{else}
 	<P1801>0</P1801>
 	{/if}
 
     <!-- # Account Name -->
-    <P1817>{$display_name_6}</P1817>
+    <P1817>{$account.6.display_name}</P1817>
 
     <!-- # SIP Server -->
-    <P1802>{$server_address_6}</P1802>
+    <P1802>{$account.6.server_address}</P1802>
 
     <!-- # SIP User ID -->
-    <P1804>{$user_id_6}</P1804>
+    <P1804>{$account.6.user_id}</P1804>
 
     <!-- # SIP Authenticate ID -->
-    <P1805>{$auth_id_6}</P1805>
+    <P1805>{$account.6.auth_id}</P1805>
 
     <!-- # SIP Authenticate Password -->
-    <P1806>{$user_password_6}</P1806>
+    <P1806>{$account.6.password}</P1806>
 
     <!-- # Voice Mail UserID -->
     <P1826>*97</P1826>
@@ -2879,10 +2906,10 @@
     <!-- ####################################################################### -->
 
     <!-- # Outbound Proxy -->
-    <P1803>{$outbound_proxy_6}</P1803>
+    <P1803>{$account.6.outbound_proxy}</P1803>
 
     <!-- # Secondary Outbound Proxy -->
-    <P2833></P2833>
+    <P2833>{$account.6.outbound_proxy_secondary}</P2833>
 
     <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
@@ -2921,7 +2948,7 @@
 
     <!-- # Register Expiration (m). In minutes. Default value is 60 -->
     <!-- # Number: 0 - 64800 -->
-    <P1812>{$register_expires_6}</P1812>
+    <P1812>{$account.6.register_expires}</P1812>
 
     <!-- # Register before Expiration (s). Default value is 0 -->
     <!-- # Number -->
@@ -3010,11 +3037,11 @@
     <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
     {$tp=0}
-	{if $sip_transport_6 == 'udp'}{$tp=0}{/if}
-	{if $sip_transport_6 == 'tcp'}{$tp=1}{/if}
-	{if $sip_transport_6 == 'tls'}{$tp=2}{/if}
-	{if $sip_transport_6 == 'dns srv'}{$tp=1}{/if}
-	<P1848>{$tp}</P1848>
+    {if $account.6.sip_transport == 'udp'}{$tp=0}{/if}
+    {if $account.6.sip_transport == 'tcp'}{$tp=1}{/if}
+    {if $account.6.sip_transport == 'tls'}{$tp=2}{/if}
+    {if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if}
+    <P1848>{$tp}</P1848>
 
     <!-- # SIP URI Scheme When Using TLS -->
     <!-- # 0 -sip, 1 - sips. Default value is 0. -->
@@ -3225,7 +3252,12 @@
     <P2882>0</P2882>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ | x+*x+*x+*x+ | x+*x+*x+*x+#x+ } -->
+    
+    {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
+    {else}
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -3746,7 +3778,7 @@
     <P8300>2</P8300>
 
     <!-- # Host name (DHCP option 12) -->
-    <P146></P146>
+    <P146>phone-{$account.1.display_name}</P146>
 
     <!-- # Vendor Class ID (DHCP option 60) -->
     <P148>GAC2500</P148>
@@ -4105,11 +4137,13 @@
     <P212>1</P212>
 
     <!-- # Firmware Server Path -->
-    {if isset($grandstream_firmware_path)}
-	<P192>{$grandstream_firmware_path}</P192>
-	{else}
-	<P192>{$domain_name}{$project_path}/app/provision</P192>
-	{/if}
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gac2500/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gac2500</P192>
+    {else}
+    <P192>{$domain_name}{$project_path}/app/provision</P192>
+    {/if}
 
     <!-- # Firmware  HTTP/HTTPS User Name -->
     <P6768></P6768>