diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index aee52618af..fd6f1c29f5 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -105,10 +105,10 @@
 <P271>1</P271>
 
 <!-- Account Name -->
-<P270>{$display_name_1}</P270>
+<P270>{$account.1.display_name}</P270>
 
 <!-- SIP Server -->
-<P47>{$server_address_1}</P47>
+<P47>{$account.1.server_address}</P47>
 
 <!-- Secondary SIP Server -->
 <P2312></P2312>
@@ -117,16 +117,16 @@
 <P48></P48>
 
 <!-- SIP User ID -->
-<P35>{$user_id_1}</P35>
+<P35>{$account.1.user_id}</P35>
 
 <!-- Authenticate ID -->
-<P36>{$user_id_1}</P36>
+<P36>{$account.1.user_id}</P36>
 
 <!-- Authenticate Password -->
-<P34>{$user_password_1}</P34>
+<P34>{$account.1.password}</P34>
 
 <!-- Display Name -->
-<P3>{$display_name_1}</P3>
+<P3>{$account.1.display_name}</P3>
 
 <!-- Voice Mail UserID -->
 <P33>*97</P33>
@@ -607,11 +607,11 @@
 
 <!-- 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 -->
@@ -623,19 +623,19 @@
 
 <!-- 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 -->
@@ -1158,11 +1158,11 @@
 
 <!-- Account Name -->
 <!-- String -->
-<P517>{$display_name_3}</P517>
+<P517>{$account.3.display_name}</P517>
 
 <!-- SIP Server -->
 <!-- String -->
-<P502>{$server_address_3}</P502>
+<P502>{$account.3.server_address}</P502>
 
 <!-- Secondary SIP Server -->
 <!-- String -->
@@ -1174,19 +1174,19 @@
 
 <!-- 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.user_id}</P505>
 
 <!-- Authenticate Password -->
 <!-- String -->
-<P506>{$user_password_3}</P506>
+<P506>{$account.3.password}</P506>
 
 <!-- Display Name -->
 <!-- String -->
-<P507>{$display_name_3}</P507>
+<P507>{$account.3.display_name}</P507>
 
 <!-- Voice Mail UserID -->
 <!-- String -->
@@ -1707,11 +1707,11 @@
 
 <!-- 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 -->
@@ -1723,19 +1723,19 @@
 
 <!-- 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.user_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 -->
@@ -2253,11 +2253,11 @@
 
 <!-- Account Name -->
 <!-- String -->
-<P1717>{$display_name_5}</P1717>
+<P1717>{$account.5.display_name}</P1717>
 
 <!-- SIP Server -->
 <!-- String -->
-<P1702>{$server_address_5}</P1702>
+<P1702>{$account.5.server_address}</P1702>
 
 <!-- Secondary SIP Server -->
 <!-- String -->
@@ -2269,19 +2269,19 @@
 
 <!-- SIP User ID -->
 <!-- String -->
-<P1704>{$user_id_5}</P1704>
+<P1704>{$account.5.user_id}</P1704>
 
 <!-- Authenticate ID -->
 <!-- String -->
-<P1705>{$user_id_5}</P1705>
+<P1705>{$account.5.user_id}</P1705>
 
 <!-- Authenticate Password -->
 <!-- String -->
-<P1706>{$user_password_5}</P1706>
+<P1706>{$account.5.password}</P1706>
 
 <!-- Display Name -->
 <!-- String -->
-<P1707>{$display_name_5}</P1707>
+<P1707>{$account.5.display_name}</P1707>
 
 <!-- Voice Mail UserID -->
 <!-- String -->
@@ -2801,11 +2801,11 @@
 
 <!-- Account Name -->
 <!-- String -->
-<P1817>{$display_name_6}</P1817>
+<P1817>{$account.6.display_name}</P1817>
 
 <!-- SIP Server -->
 <!-- String -->
-<P1802>{$server_address_6}</P1802>
+<P1802>{$account.6.server_address}</P1802>
 
 <!-- Secondary SIP Server -->
 <!-- String -->
@@ -2817,19 +2817,19 @@
 
 <!-- SIP User ID -->
 <!-- String -->
-<P1804>{$user_id_6}</P1804>
+<P1804>{$account.6.user_id}</P1804>
 
 <!-- Authenticate ID -->
 <!-- String -->
-<P1805>{$user_id_6}</P1805>
+<P1805>{$account.6.user_id}</P1805>
 
 <!-- Authenticate password -->
 <!-- String -->
-<P1806>{$user_password_6}</P1806>
+<P1806>{$account.6.password}</P1806>
 
 <!-- Display Name -->
 <!-- String -->
-<P1807>{$display_name_6}</P1807>
+<P1807>{$account.6.display_name}</P1807>
 
 <!-- Voice Mail UserID -->
 <!-- String -->