diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
index 9293b1b67f..90ffda8eea 100644
--- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
@@ -196,17 +196,17 @@
     <!-- Account Name -->
     <P270></P270>
     <!-- SIP Server: max. length = 96 -->
-    <P47>{$server_address_1}</P47>
+    <P47>{$account.1.server_address}</P47>
     <!-- Outbound Proxy -->
-    <P48>{$outbound_proxy_primary_1}</P48>
+    <P48>{$account.1.outbound_proxy_primary}</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 (John Doe) -->
-    <P3>{$display_name_1}</P3>
+    <P3>{$account.1.display_name}</P3>
     <!-- Use DNS SRV. 0 - No, 1 - Yes. -->
     <P103>0</P103>
     <!-- SIP User ID is phone number. 0 - no, 1 - yes -->
@@ -334,17 +334,17 @@
     <!--Account Name -->
     <P417>0</P417>
     <!-- SIP Server -->
-    <P402>{$server_address_2}</P402>
+    <P402>{$account.2.server_address}</P402>
     <!-- Outbound Proxy Server -->
     <P403></P403>
     <!-- Account 2 SIP User ID -->
-    <P404>{$user_id_2}</P404>
+    <P404>{$account.2.user_id}</P404>
     <!-- Authenticate ID -->
-    <P405>{$user_id_2}</P405>
+    <P405>{$account.2.user_id}</P405>
     <!-- Authenticate Password -->
-    <P406>{$user_password_2}</P406>
+    <P406>{$account.2.password}</P406>
     <!-- Display Name (John Doe) -->
-    <P407>{$display_name_2}</P407>
+    <P407>{$account.2.display_name}</P407>
     <!-- Use DNS SRV. 0 - No, 1 - Yes -->
     <P408>0</P408>
     <!-- User ID is phone number; "user=phone". 0 - no, 1 - yes -->
@@ -473,17 +473,17 @@
     <!-- Account Name -->
     <P517></P517>
     <!-- SIP Server -->
-    <P502>{$server_address_3}</P502>
+    <P502>{$account.3.server_address}</P502>
     <!-- Outbound Proxy Server -->
     <P503></P503>
     <!-- SIP User ID -->
-    <P504>{$user_id_3}</P504>
+    <P504>{$account.3.user_id}</P504>
     <!-- Authenticate ID -->
-    <P505>{$user_id_3}</P505>
+    <P505>{$account.3.user_id}</P505>
     <!-- Authenticate Password -->
-    <P506>{$user_password_3}</P506>
+    <P506>{$account.3.password}</P506>
     <!-- Display Name (John Doe) -->
-    <P507>{$display_name_3}</P507>
+    <P507>{$account.3.display_name}</P507>
     <!-- Use DNS SRV. 0 - No, 1 - Yes. -->
     <P508>0</P508>
     <!-- User ID is phone. "user=phone". 0 - no, 1 - yes -->