diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 2db0149983..5d956f803a 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -31,15 +31,30 @@
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
+    
+{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}
 
     <!-- # Outbound Proxy -->
     <!-- # String -->
+    
+{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}	
 
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
+    
+{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}	
 
     <!-- # BLF Server -->
     <!-- # String -->
@@ -102,6 +117,7 @@
     <!-- # 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>
 {else}
@@ -195,6 +211,7 @@
     <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS/TCP. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+
 {$tp=0}
 {if $account.1.sip_transport == 'udp'}{$tp=0}{/if}
 {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if}
@@ -232,6 +249,7 @@
     <!-- # SUBSCRIBE for MWI. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+
 {if isset($subscribe_mwi)}
     <P99>1</P99>
 {else}
@@ -563,6 +581,7 @@
     <!-- # SRTP Mode. 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3 -->
     <!-- # Mandatory -->
+
 {if isset($grandstream_srtp)}
     <P183>{$grandstream_srtp}</P183>
 {else}
@@ -672,6 +691,7 @@
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
     <!-- # Mandatory -->
+
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
@@ -760,6 +780,7 @@
     <!-- # Account Ring Tone. 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
+
 {if isset($grandstream_account_ring_tone_1)}
     <P104>{$grandstream_account_ring_tone_1}</P104>
 {/if}
@@ -966,15 +987,30 @@
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
+    
+{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}
 
     <!-- # Outbound Proxy -->
     <!-- # String -->
-    <P403>{$account.2.outbound_proxy}</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 -->
+    
+{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}
 
     <!-- # BLF Server -->
     <!-- # String -->
@@ -1900,15 +1936,30 @@
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
+    
+{if isset($account.3.server_address_secondary)}
+    <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
+{else}
     <P2512>{$account.3.server_address_secondary}</P2512>
+{/if}
 
     <!-- # Outbound Proxy -->
     <!-- # String -->
-    <P503>{$account.3.outbound_proxy}</P503>
+
+{if isset($account.3.outbound_proxy_primary)}
+    <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
+{else}
+    <P503>{$account.3.outbound_proxy_primary}</P503>
+{/if}	
 
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
+
+{if isset($account.3.outbound_proxy_secondary)}
+    <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
+{else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
+{/if}
 
     <!-- # BLF Server -->
     <!-- # String -->
@@ -1971,7 +2022,7 @@
     <!-- # 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)}
+{if isset($grandstream_nat_traversal)}
     <P514>{$grandstream_nat_traversal}</P514>
 {else}
     <P514>0</P514>
@@ -2833,15 +2884,30 @@
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
+    
+{if isset($account.4.server_address_secondary)}
+    <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
+{else}
     <P2612>{$account.4.server_address_secondary}</P2612>
+{/if}
 
     <!-- # Outbound Proxy -->
     <!-- # String -->
-    <P603>{$account.4.outbound_proxy}</P603>
+    
+{if isset($account.4.outbound_proxy_primary)}
+    <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
+{else}
+    <P603>{$account.4.outbound_proxy_primary}</P603>
+{/if}	
 
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
+    
+{if isset($account.4.outbound_proxy_secondary)}
+    <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
+{else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
+{/if}
 
     <!-- # BLF Server -->
     <!-- # String -->
@@ -3769,15 +3835,30 @@
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
+
+{if isset($account.5.server_address_secondary)}
+    <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
+{else}
     <P2712>{$account.5.server_address_secondary}</P2712>
+{/if}
 
     <!-- # Outbound Proxy -->
     <!-- # String -->
-    <P1703>{$account.5.outbound_proxy}</P1703>
+
+{if isset($account.5.outbound_proxy_primary)}
+    <P1703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P1703>
+{else}
+    <P1703>{$account.5.outbound_proxy_primary}</P1703>
+{/if}
 
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
+
+{if isset($account.5.outbound_proxy_secondary)}
+    <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
+{else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
+{/if}
 
     <!-- # BLF Server -->
     <!-- # String -->
@@ -4702,15 +4783,30 @@
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
+    
+{if isset($account.6.server_address_secondary)}
+    <P2812>{$account.6.server_address_secondary}:{$account.6.sip_port}</P2812>
+{else}
     <P2812>{$account.6.server_address_secondary}</P2812>
+{/if}
 
     <!-- # Outbound Proxy -->
     <!-- # String -->
-    <P1803>{$account.6.outbound_proxy}</P1803>
+
+{if isset($account.6.outbound_proxy_primary)}
+    <P1803>{$account.6.outbound_proxy_primary}:{$account.6.sip_port}</P1803>
+{else}
+    <P1803>{$account.6.outbound_proxy_primary}</P1803>
+{/if}
 
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
+
+{if isset($account.6.outbound_proxy_secondary)}
+    <P2833>{$account.5.outbound_proxy_secondary}:{$account.6.sip_port}</P2833>
+{else}
     <P2833>{$account.6.outbound_proxy_secondary}</P2833>
+{/if}
 
     <!-- # BLF Server -->
     <!-- # String -->
@@ -4774,7 +4870,7 @@
     <!-- # Number: 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
 {if isset($grandstream_nat_traversal)}
-<P1814>{$grandstream_nat_traversal}</P1814>
+     <P1814>{$grandstream_nat_traversal}</P1814>
 {else}
     <P1814>0</P1814>
 {/if}