diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 150ddb7f04..5261637892 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -158,7 +158,11 @@
 <!--# SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS/TCP. Default is 0-->
 <!--# Number: 0, 1, 2-->
 <!--# Mandatory-->
-    <P130>0</P130>
+    <!--# P130 = 0-->
+{if $account.1.sip_transport == 'udp'}P130 = 0{/if}
+{if $account.1.sip_transport == 'tcp'}P130 = 1{/if}
+{if $account.1.sip_transport == 'tls'}P130 = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}P130 = 1{/if}
 
 <!--# SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1-->
 <!--# Number: 0, 1-->
@@ -789,10 +793,10 @@
 <!--# Number: 0, 1, 2-->
 <!--# Mandatory-->
 <!--# P448 = 0-->
-{if $account.1.sip_transport == 'udp'}P448 = 0{/if}
-{if $account.1.sip_transport == 'tcp'}P448 = 1{/if}
-{if $account.1.sip_transport == 'tls'}P448 = 2{/if}
-{if $account.1.sip_transport == 'dns srv'}P448 = 1{/if}
+{if $account.2.sip_transport == 'udp'}P448 = 0{/if}
+{if $account.2.sip_transport == 'tcp'}P448 = 1{/if}
+{if $account.2.sip_transport == 'tls'}P448 = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}P448 = 1{/if}
 
 <!--# SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1-->
 <!--# Number: 0, 1-->
@@ -1418,7 +1422,11 @@
 <!--# SIP Transport. 0 - UDP, 1 - TCP. 2- TCP/TLS. Default is 0-->
 <!--# Number: 0, 1, 2-->
 <!--# Mandatory-->
-    <P548>0</P548>
+    <!--# P548 = 0-->
+{if $account.3.sip_transport == 'udp'}P548 = 0{/if}
+{if $account.3.sip_transport == 'tcp'}P548 = 1{/if}
+{if $account.3.sip_transport == 'tls'}P548 = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}P548 = 1{/if}
 
 <!--# SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1-->
 <!--# Number: 0, 1-->
@@ -2044,7 +2052,11 @@
 <!--# SIP Transport. 0 - UDP, 1 - TCP. 2 - TCP/TLS. Default is 0-->
 <!--# Number: 0, 1, 2-->
 <!--# Mandatory-->
-    <P648>0</P648>
+    <!--# P648 = 0-->
+{if $account.4.sip_transport == 'udp'}P648 = 0{/if}
+{if $account.4.sip_transport == 'tcp'}P648 = 1{/if}
+{if $account.4.sip_transport == 'tls'}P648 = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}P648 = 1{/if}
 
 <!--# SIP URI Scheme When Using TLS. 0 - sip, 1 - sips. Default is 1-->
 <!--# Number: 0, 1-->
@@ -3707,12 +3719,12 @@
 <!--# 0 - No, 1 - YES, HTTP, 2 - YES, TFTP, 3 - YES, HTTPS. Default is 0-->
 <!--# Number: 0, 1, 2, 3-->
 <!--# Mandatory-->
-    <P340>0</P340>
+    <P340>{$grandstream_enable_idle_screen_download}</P340>
 
 <!--# Download Screen XML At Boot-up. 0 - No, 1 - Yes. Default is 0-->
 <!--# Number: 0, 1-->
 <!--# Mandatory-->
-    <P1349>0</P1349>
+    <P1349>{$grandstream_download_idle_at_boot}</P1349>
 
 <!--# Use Custom File Name. 0 - No, 1 - Yes. Default is 0-->
 <!--# Number: 0, 1-->