diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index c9b376f786..d467265e94 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -11,32 +11,32 @@
     <P271></P271>
     <!-- Account Name -->
     <!-- String -->
-    <P270>{$display_name_1}</P270>
+    <P270>{$account.1.display_name}</P270>
     <!-- SIP Server -->
     <!-- String -->
-    <P47>{$server_address_1}</P47>
+    <P47>{$account.1.server_address}</P47>
     <!-- Secondary SIP Server -->
     <!-- String -->
     <P2312></P2312>
     <!--  Outbound Proxy -->
      <!--  String -->
-    <P48>{$outbound_proxy_1}</P48>
+    <P48>{$account.1.outbound_proxy}</P48>
 
     <!--  Backup Outbound Proxy -->
     <!--  String -->
-    <P2333>{$outbound_proxy_secondary_1}</P2333>
+    <P2333>{$account.1.outbound_proxy_secondary}</P2333>
     <!-- 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>
@@ -444,32 +444,32 @@
     <P401>1</P401>
     <!-- Account Name -->
     <!-- String -->
-    <P417>{$display_name_2}</P417>
+    <P417>{$account.2.display_name}</P417>
     <!-- SIP Server -->
     <!-- String -->
-    <P402>{$server_address_2}</P402>
+    <P402>{$account.2.server_address}</P402>
     <!-- Secondary SIP Server -->
     <!-- String -->
     <P2412></P2412>
     <!--  Outbound Proxy -->
     <!--  String -->
-     <P403>{$outbound_proxy_2}</P403>
+     <P403>{$account.2.outbound_proxy}</P403>
 
     <!--  Backup Outbound Proxy -->
     <!--  String -->
-    <P2433>{$outbound_proxy_secondary_2}</P2433>
+    <P2433>{$account.2.outbound_proxy_secondary}</P2433>
     <!-- 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.auth_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_2}</P407>
     <!-- Voice Mail UserID -->
     <!-- String -->
     <P426>*97</P426>
@@ -876,29 +876,29 @@
     <P501>1</P501>
     <!-- Account Name -->
     <!-- String -->
-    <P517>{$display_name_3}</P517>
+    <P517>{$account.3.account.3.display_name}</P517>
     <!-- SIP Server -->
     <!-- String -->
-    <P502>{$server_address_3}</P502>
+    <P502>{$account.3.server_address}</P502>
     <!-- Secondary SIP Server -->
     <!-- String -->
     <P2512></P2512>
     <!--  Outbound Proxy -->
     <!--  String -->
-    <P503>{$outbound_proxy_3}</P503>
+    <P503>{$account.3.outbound_proxy}</P503>
 
     <!--  Backup Outbound Proxy -->
     <!--  String -->
-    <P2533>{$outbound_proxy_secondary_3}</P2533>
+    <P2533>{$account.3.outbound_proxy_secondary}</P2533>
     <!-- SIP User ID -->
     <!-- String -->
-    <P504>{$user_id_3}</P504>
+    <P504>{$account.3.user_id}</P504>
     <!-- Authenticate ID -->
     <!-- String -->
-    <P505>{$user_id_3}</P505>
+    <P505>{$account.3.auth_id}</P505>
     <!-- Authenticate Password -->
     <!-- String -->
-    <P506>{$user_password_3}</P506>
+    <P506>{$account.3.password}</P506>
     <!-- Display Name -->
     <!-- String -->
     <P507>{$display_name_3}</P507>
@@ -1307,32 +1307,32 @@
     <P601>1</P601>
     <!-- Account Name -->
     <!-- String -->
-    <P617>{$display_name_4}</P617>
+    <P617>{$account.4.display_name}</P617>
     <!-- SIP Server -->
     <!-- String -->
-    <P602>{$server_address_4}</P602>
+    <P602>{$account.4.server_address}</P602>
     <!-- Secondary SIP Server -->
     <!-- String -->
     <P2612></P2612>
     <!--  Outbound Proxy -->
     <!--  String -->
-    <P603>{$outbound_proxy_4}</P603>
+    <P603>{$account.4.outbound_proxy}</P603>
 
     <!--  Backup Outbound Proxy -->
     <!--  String -->
-    <P2633>{$outbound_proxy_secondary_4}</P2633>
+    <P2633>{$account.4.outbound_proxy_secondary}</P2633>
     <!-- SIP User ID -->
     <!-- String -->
-    <P604>{$user_id_4}</P604>
+    <P604>{$account.4.user_id}</P604>
     <!-- Authenticate ID -->
     <!-- String -->
-    <P605>{$user_id_4}</P605>
+    <P605>{$account.4.auth_id}</P605>
     <!-- Authenticate password -->
     <!-- String -->
-    <P606>{$user_password_4}</P606>
+    <P606>{$account.4.password}</P606>
     <!-- Display Name -->
     <!-- String -->
-    <P607>{$display_name_4}</P607>
+    <P607>{$account.4.display_name}</P607>
     <!-- Voice Mail UserID -->
     <!-- String -->
     <P626>*97</P626>