diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml
index 14a7a82f40..2408aafad6 100644
--- a/resources/templates/provision/grandstream/wp820/{$mac}.xml
+++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml
@@ -26,31 +26,35 @@
 
 <!-- # Account Name -->
 <!-- # String -->
-<P270>{$display_name_1}</P270>
+<P270>{$account.1.display_name}</P270>
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P47>{$server_address_1}</P47>
+<P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
-<P2312>{$secondary_server_address_1}</P2312>
-
+    
+{if isset($account.1.server_address_secondary)}
+    <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
+{else}
+    <P2312>{$account.1.server_address_secondary}</P2312>
+{/if}
 <!-- # SIP User ID -->
 <!-- # String -->
-<P35>{$user_id_1}</P35>
+<P35>{$account.1.user_id}</P35>
 
 <!-- # SIP Authenticate ID -->
 <!-- # String -->
-<P36>{$auth_id_1}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- # SIP Authenticate Password -->
 <!-- # String -->
-<P34>{$user_password_1}</P34>
+<P34>{$account.1.password}</P34>
 
 <!-- # Name -->
 <!-- # String -->
-<P3>{$display_name_1}</P3>
+<P3>{$account.1.display_name}</P3>
 
 <!-- # TEL URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
@@ -65,19 +69,28 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-<P48>{$outbound_proxy_1}</P48>
+{if isset($account.1.outbound_proxy_primary)}
+    <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
+{else}
+    <P48>{$account.1.outbound_proxy_primary}</P48>
+{/if}
 
 <!-- # Secondary Outbound Proxy -->
 <!-- # String -->
-<P2333></P2333>
+    
+{if isset($account.1.outbound_proxy_secondary)}
+    <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
+{else}
+    <P2333>{$account.1.outbound_proxy_secondary}</P2333>
+{/if}
 
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_dns_mode)}
-<P103>{$grandstream_dns_mode}</P103>
+    <P103>{$grandstream_dns_mode}</P103>
 {else}
-<P103>0</P103>
+    <P103>0</P103>
 {/if}
 
 <!-- # DNS SRV Fail-over Mode. 0 - Default, 1 - Saved one until DNS TTL, 2 - Saved one until no response. Default is 0 -->
@@ -88,10 +101,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+
 {if isset($grandstream_nat_traversal)}
-<P52>{$grandstream_nat_traversal}</P52>
+    <P52>{$grandstream_nat_traversal}</P52>
 {else}
-<P52>0</P52>
+    <P52>0</P52>
 {/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
@@ -116,10 +130,10 @@
 <!-- # Register Expiration (in minutes). Default is 60. Max about 45 days -->
 <!-- # Number: 1 - 64800 -->
 <!-- # Mandatory -->
-{if isset($register_expires_1)}
-<P32>{$register_expires_1}</P32>
+{if isset($account.1.register_expires)}
+    <P32>{$account.1.register_expires}</P32>
 {else}
-<P32>2</P32>
+    <P32>2</P32>
 {/if}
 
 <!-- # Re-register Before Expiration (in seconds). Default is 0 second -->
@@ -157,9 +171,9 @@
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 {if isset($subscribe_mwi)}
-<P99>1</P99>
+    <P99>1</P99>
 {else}
-<P99>0</P99>
+    <P99>0</P99>
 {/if}
 
 <!-- # Use Privacy Header -->
@@ -403,9 +417,9 @@
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_srtp)}
-<P443>{$grandstream_srtp}</P443>
+    <P443>{$grandstream_srtp}</P443>
 {else}
-<P443>0</P443>
+    <P443>0</P443>
 {/if}
 
 <!-- # SRTP Key Length. 0 - AES 128&256 bit, 1 - AES 128 bit, 2 - AES 256 bit. Default is 0 -->
@@ -636,39 +650,42 @@
 <!-- # Account Active. 0 - No, 1 - Yes. Default is 1 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-{if isset($user_password_2)}
-<P401>1</P401>
+{if isset($account.2.password)}
+    <P401>1</P401>
 {else}
-<P401>0</P401>
+    <P401>0</P401>
 {/if}
 
 <!-- # Account Name -->
 <!-- # String -->
-<P417>{$display_name_2}</P417>
+<P417>{$account.2.display_name}</P417>
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P402>{$server_address_2}</P402>
+<P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
-<P2412></P2412>
-
+{if isset($account.2.server_address_secondary)}
+    <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
+{else}
+    <P2412>{$account.2.server_address_secondary}</P2412>
+{/if}
 <!-- # SIP User ID -->
 <!-- # String -->
-<P404>{$user_id_2}</P404>
+<P404>{$account.2.user_id}</P404>
 
 <!-- # SIP Authenticate ID -->
 <!-- # String -->
-<P405>{$auth_id_2}</P405>
+<P405>{$account.2.auth_id}</P405>
 
 <!-- # SIP Authenticate Password -->
 <!-- # String -->
-<P406>{$user_password_2}</P406>
+<P406>{$account.2.password}</P406>
 
 <!-- # Name -->
 <!-- # String -->
-<P407>{$display_name_2}</P407>
+<P407>{$account.2.display_name}</P407>
 
 <!-- # TEL URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
@@ -683,19 +700,27 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-<P403>{$outbound_proxy_2}</P403>
+{if isset($account.2.outbound_proxy_primary)}
+    <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
+{else}
+    <P403>{$account.2.outbound_proxy_primary}</P403>
+{/if}
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
-<P2433></P2433>
+{if isset($account.2.outbound_proxy_secondary)}
+    <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
+{else}
+    <P2433>{$account.2.outbound_proxy_secondary}</P2433>
+{/if}
 
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_dns_mode)}
-<P408>{$grandstream_dns_mode}</P408>
+    <P408>{$grandstream_dns_mode}</P408>
 {else}
-<P408>0</P408>
+    <P408>0</P408>
 {/if}
 
 <!-- # DNS SRV Fail-over Mode. 0 - Default, 1 - Saved one until DNS TTL, 2 - Saved one until no response. Default is 0 -->
@@ -707,9 +732,9 @@
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
 {if isset($grandstream_nat_traversal)}
-<P414>{$grandstream_nat_traversal}</P414>
+    <P414>{$grandstream_nat_traversal}</P414>
 {else}
-<P414>0</P414>
+    <P414>0</P414>
 {/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
@@ -734,10 +759,10 @@
 <!-- # Register Expiration (in minutes). Default is 60. Max about 45 days -->
 <!-- # Number: 1 - 64800 -->
 <!-- # Mandatory -->
-{if isset($register_expires_2)}
-<P412>{$register_expires_2}</P412>
+{if isset($account.2.register_expires)}
+    <P412>{$account.2.register_expires}</P412>
 {else}
-<P412>2</P412>
+    <P412>2</P412>
 {/if}
 
 <!-- # Re-register Before Expiration (in seconds). Default is 0 second -->
@@ -775,9 +800,9 @@
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 {if isset($subscribe_mwi)}
-<P415>1</P415>
+    <P415>1</P415>
 {else}
-<P415>0</P415>
+    <P415>0</P415>
 {/if}
 
 <!-- # Use Privacy Header -->
@@ -1021,9 +1046,9 @@
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_srtp)}
-<P183>{$grandstream_srtp}</P183>
+    <P183>{$grandstream_srtp}</P183>
 {else}
-<P183>0</P183>
+    <P183>0</P183>
 {/if}
 
 <!-- # SRTP Key Length. 0 - AES 128&256 bit, 1 - AES 128 bit, 2 - AES 256 bit. Default is 0 -->
@@ -1849,9 +1874,9 @@
 <!-- # Assign NTP Server Address  -->
 <!-- # String -->
 {if isset($ntp_server_primary)}
-<P30>{$ntp_server_primary}</P30>
+    <P30>{$ntp_server_primary}</P30>
 {else}
-<P30>pool.ntp.org</P30>
+    <P30>pool.ntp.org</P30>
 {/if}
 
 <!-- # DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
@@ -1963,9 +1988,11 @@
 
 <!-- # Time Zone -->
 {if isset($grandstream_timezone) }
-<P64>{$grandstream_timezone}</P64>
+    <P64>{$grandstream_timezone}</P64>
+{elseif isset($grandstream_gxp_time_zone) }
+    <P64>{$grandstream_gxp_time_zone}</P64>
 {else}
-<!-- # P64 = PST8PDT -->
+    <P64>auto</P64>
 {/if}
 
 <!-- # Time Display Format. 0 - 12 Hour, 1 - 24 Hour -->
@@ -2074,7 +2101,11 @@
 <!-- #################################################################### -->
 <!-- # New Admin Password  Default value is admin -->
 <!-- # String -->
-<P2>{$admin_password}</P2>
+{if isset($admin_password)}
+    <P2>{$admin_password}</P2>
+{else}
+    <P2>{$mac|replace:'-':''}</P2>
+{/if}
 
 <!-- #################################################################### -->
 <!-- # System Settings/Security Settings/SIP TLS                       ## -->
@@ -2360,9 +2391,9 @@
 <!-- # Number: 0, 1 , 2, 3, 4 -->
 <!-- # Mandatory -->
 {if isset($grandstream_syslog_level)}
-<P208>{$grandstream_syslog_level}</P208>
+    <P208>{$grandstream_syslog_level}</P208>
 {else}
-<P208>0</P208>
+    <P208>0</P208>
 {/if}
 
 <!-- # Syslog Keyword Filtering -->
@@ -2487,9 +2518,9 @@
 <!-- # Number: 0, 120, 240, 360, 480, 720 -->
 <!-- # Mandatory -->
 {if isset($grandstream_phonebook_download_interval)}
-<P332>{$grandstream_phonebook_download_interval}</P332>
+    <P332>{$grandstream_phonebook_download_interval}</P332>
 {else}
-<P332>0</P332>
+    <P332>0</P332>
 {/if}
 
 <!-- ################## -->