diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 79d356cf02..f3aa87ab19 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -18,11 +18,11 @@
 
 <!--# Account Name-->
 <!--# String-->
-    <P270>{$display_name_1}</P270>
+    <P270>{$account.1.display_name}</P270>
 
 <!--# SIP Server-->
 <!--# String-->
-    <P47>{$server_address_1}</P47>
+    <P47>{$server_address}</P47>
 
 <!--# Secondary SIP Server-->
 <!--# String-->
@@ -38,19 +38,19 @@
 
 <!--# SIP User ID-->
 <!--# String-->
-    <P35>{$display_name_1}</P35>
+    <P35>{$account.1.display_name}</P35>
 
 <!--# Authenticate ID-->
 <!--# String-->
-    <P36>{$auth_id_1}</P36>
+    <P36>{$account.1.auth_id}</P36>
 
 <!--# Authenticate Password-->
 <!--# String-->
-    <P34>{$user_password_1}</P34>
+    <P34>{$account.1.password}</P34>
 
 <!--# Display Name-->
 <!--# String-->
-    <P3>{$display_name_1}</P3>
+    <P3>{$account.1.display_name}</P3>
 
 <!--# Voice Mail UserID-->
 <!--# String-->
@@ -788,10 +788,10 @@
 <!--# Number: 0, 1, 2-->
 <!--# Mandatory-->
 <!--# P448 = 0-->
-{if $sip_transport_1 == 'udp'}P448 = 0{/if}
-{if $sip_transport_1 == 'tcp'}P448 = 1{/if}
-{if $sip_transport_1 == 'tls'}P448 = 2{/if}
-{if $sip_transport_1 == 'dns srv'}P448 = 1{/if}
+{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}
 
 <!--# SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1-->
 <!--# Number: 0, 1-->