diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index 57899cfd3a..88c347fc10 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$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>{$account.1.server_address}</P47>
 
 <!--  Secondary SIP Server -->
 <!--  String -->
@@ -34,19 +34,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>
 
 <!--  Display Name -->
 <!--  String -->
-<P3>{$display_name_1}</P3>
+<P3>{$account.1.display_name}</P3>
 
 <!--  Voice Mail UserID -->
 <!--  String -->