diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index bad289db43..9c1852641f 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -769,11 +769,11 @@
 
 <!-- # 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 -->
@@ -793,19 +793,19 @@
 
 <!-- # 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>
 
 <!-- # Name -->
 <!-- # String -->
-<P3>{$display_name_1}</P3>
+<P3>{$account.1.display_name}</P3>
 
 <!-- # Voice Mail UserID -->
 <!-- # String -->
@@ -1467,19 +1467,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.auth_id}</P405>
 
 <!-- # Authenticate password -->
 <!-- # String -->
-<P406>{$user_password_2}</P406>
+<P406>{$account.2.password}</P406>
 
 <!-- # Name -->
 <!-- # String -->
-<P407>{$display_name_2}</P407>
+<P407>{$account.2.display_name}</P407>
 
 <!-- # Voice Mail UserID -->
 <!-- # String -->
@@ -2111,11 +2111,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 -->
@@ -2135,19 +2135,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.auth_id}</P505>
 
 <!-- # Authenticate Password -->
 <!-- # String -->
-<P506>{$user_password_3}</P506>
+<P506>{$account.3.password}</P506>
 
 <!-- # Name -->
 <!-- # String -->
-<P507>{$display_name_3}</P507>
+<P507>{$account.3.display_name}</P507>
 <!-- 	 -->
 <!-- # Voice Mail UserID -->
 <!-- # String -->