diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 9a465cc112..58eabbf6c8 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -35,9 +35,9 @@
 <!-- Firmware Server Path -->
 <!-- String -->
 {if isset($grandstream_firmware_path) && isset($firmware_version)}
-<P192>{$grandstream_firmware_path}/gxp21xx/{$firmware_version}</P192>
+<P192>{$grandstream_firmware_path}/{$firmware_version}</P192>
 {elseif isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}/gxp21xx</P192>
+<P192>{$grandstream_firmware_path}/</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
@@ -111,10 +111,10 @@
 <P47>{$account.1.server_address}</P47>
 
 <!-- Secondary SIP Server -->
-<P2312></P2312>
+<P2312>{$account.1.server_address_secondary}</P2312>
 
 <!-- Outbound Proxy -->
-<P48></P48>
+<P48>{$account.1.outbound_proxy_primary}</P48>
 
 <!-- SIP User ID -->
 <P35>{$account.1.user_id}</P35>
@@ -183,7 +183,13 @@
 <P250>400</P250>
 
 <!-- SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS/TCP. Default is 0 -->
-<P130>0</P130>
+
+{$tp=0}
+{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 is 1 -->
 <P2329>1</P2329>
@@ -620,11 +626,11 @@
 
 <!-- Secondary SIP Server -->
 <!-- String -->
-<P2412></P2412>
+<P2412>{$account.2.server_address_secondary}</P2412>
 
 <!-- Outbound Proxy -->
 <!-- String -->
-<P403></P403>
+<P403>{$account.2.outbound_proxy}</P403>
 
 <!-- SIP User ID -->
 <!-- String -->
@@ -727,7 +733,12 @@
 <!-- SIP Transport. 0 - UDP, 1 - TCP, 2 - TCP/TLS. Default is 0 -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P448>0</P448>
+{$tp=0}
+{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 is 1 -->
 <!-- Number: 0, 1 -->
@@ -1046,7 +1057,12 @@
 <!-- Dial Plan. Default is { x+ | *x+ | *xx*x+ } -->
 <!-- String -->
 <!-- Mandatory -->
-<P459>{ x+ | *x+ | *xx*x+ }</P459>
+
+{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}  
 
 <!-- Delayed Call Forward Wait Time (in seconds). Default 20 -->
 <!-- Number: 1 - 120 -->
@@ -1171,11 +1187,11 @@
 
 <!-- Secondary SIP Server -->
 <!-- String -->
-<P2512></P2512>
+<P2512>{$account.3.server_address_secondary}</P2512>
 
 <!-- Outbound Proxy -->
 <!-- String -->
-<P503></P503>
+<P503>{$account.3.outbound_proxy}</P503>
 
 <!-- SIP User ID -->
 <!-- String -->
@@ -1278,7 +1294,13 @@
 <!-- SIP Transport. 0 - UDP, 1 - TCP. 2- TCP/TLS. Default is 0 -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P548>0</P548>
+
+{$tp=0}
+{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 is 1 -->
 <!-- Number: 0, 1 -->
@@ -1720,11 +1742,11 @@
 
 <!-- Secondary SIP Server -->
 <!-- String -->
-<P2612></P2612>
+<P2612>{$account.4.server_address_secondary}</P2612>
 
 <!-- Outbound Proxy -->
 <!-- String -->
-<P603></P603>
+<P603>{$account.4.outbound_proxy_primary}</P603>
 
 <!-- SIP User ID -->
 <!-- String -->
@@ -1828,7 +1850,13 @@
 <!-- SIP Transport. 0 - UDP, 1 - TCP. 2 - TCP/TLS. Default is 0 -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P648>0</P648>
+
+{$tp=0}
+{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 is 1 -->
 <!-- Number: 0, 1 -->
@@ -2266,11 +2294,11 @@
 
 <!-- Secondary SIP Server -->
 <!-- String -->
-<P2712></P2712>
+<P2712>{$account.5.server_address_secondary}</P2712>
 
 <!-- Outbound Proxy -->
 <!-- String -->
-<P1703></P1703>
+<P1703>{$account.5.outbound_proxy_primary}</P1703>
 
 <!-- SIP User ID -->
 <!-- String -->
@@ -2374,7 +2402,13 @@
 <!-- SIP Transport. 0 - UDP, 1 - TCP. 2 - TCP/TLS. Default is 0 -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P1748>0</P1748>
+
+{$tp=0}
+{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 is 1 -->
 <!-- Number: 0, 1 -->
@@ -2814,11 +2848,11 @@
 
 <!-- Secondary SIP Server -->
 <!-- String -->
-<P2812></P2812>
+<P2812>{$account.6.server_address_secondary}</P2812>
 
 <!-- Outbound Proxy -->
 <!-- String -->
-<P1803></P1803>
+<P1803>{$account.6.outbound_proxy_primary}</P1803>
 
 <!-- SIP User ID -->
 <!-- String -->
@@ -2923,7 +2957,13 @@
 <!-- SIP Transport. 0 - UDP, 1 - TCP, 2 - TCP/TLS. Default is 2 -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P1848>0</P1848>
+
+{$tp=0}
+{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 is 1 -->
 <!-- Number: 0, 1 -->