diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index 2895aa78f0..20ef31e697 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -142,7 +142,7 @@
     <!--  P270 = -->
     <!--  SIP Server -->
     <!--  String -->
-    <P47>{$server_address_1}</P47>
+    <P47>{$account.1.server_address}</P47>
     <!--  Secondary SIP Server -->
     <!--  String -->
     <P2312></P2312>
@@ -151,16 +151,16 @@
     <P48></P48>
     <!--  SIP User ID -->
     <!--  String -->
-    <P35>{$user_id_1}</P35>
+    <P35>{$account.1.user_id}</P35>
     <!--  Authenticate ID -->
     <!--  String -->
-    <P36>{$user_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 -->
     <P33>*97</P33>
@@ -571,7 +571,7 @@
     <!--  P417 =  -->
     <!--  SIP Server -->
     <!--  String -->
-    <P402>{$server_address_2}</P402>
+    <P402>{$account.2.server_address}</P402>
     <!--  Secondary SIP Server -->
     <!--  String -->
     <P2412></P2412>
@@ -580,16 +580,16 @@
     <P403></P403>
     <!--  SIP User ID -->
     <!--  String -->
-    <P404>{$user_id_2}</P404>
+    <P404>{$account.2.user_id}</P404>
     <!--  Authenticate ID -->
     <!--  String -->
-    <P405>{$user_id_2}</P405>
+    <P405>{$account.2.user_id}</P405>
     <!--  Authenticate password -->
     <!--  String -->
-    <P406>{$user_password_2}</P406>
+    <P406>{$account.2.password}</P406>
     <!--  Display Name -->
     <!--  String -->
-    <P407>{$display_name_2}</P407>
+    <P407>{$account.2.display_name}</P407>
     <!--  Voice Mail UserID -->
     <!--  String -->
     <P426>*97</P426>