diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 888526bd29..476cd8fd40 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -331,7 +331,7 @@
 
 <!-- Primary SIP Server-->
 <!-- Server address-->
-<P47>{$server_address_1}</P47>
+<P47>{$account.1.server_address}</P47>
 
 <!-- Failover SIP Server-->
 <!-- Server address-->
@@ -362,8 +362,8 @@
 
 <!-- NAT Traversal. 0 - NAT No, 1 - STUN, 2 - Keep-alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default value is 2 -->
 <!-- Number: 0, 1, 2, 3, 4, 5 -->
-{if isset($grandstream_nat_traversal_1)}
-<P52>{$grandstream_nat_traversal_1}</P52>
+{if isset($account.1.grandstream_nat_traversal)}
+<P52>{$account.1.grandstream_nat_traversal}</P52>
 {else}
 <P52>0</P52>
 {/if}
@@ -999,7 +999,7 @@
 
 <!-- Primary SIP Server -->
 <!-- Server address -->
-<P747>{$server_address_2}</P747>
+<P747>{$account.2.server_address}</P747>
 
 <!-- Failover SIP Server -->
 <!-- Server address -->
@@ -1649,16 +1649,16 @@
 <!-- Enable Port (0 - No, 1 - Yes) -->
 
 <!-- String -->
-<P4060>{$user_id_1}</P4060>
+<P4060>{$account.1.user_id}</P4060>
 
 <!-- String -->
-<P4090>{$user_id_1}</P4090>
+<P4090>{$account.1.user_id}</P4090>
 
 <!-- String -->
-<P4120>{$user_password_1}</P4120>
+<P4120>{$account.1.password}</P4120>
 
 <!-- String -->
-<P4180>{$display_name_1}</P4180>
+<P4180>{$account.1.display_name}</P4180>
 
 <!-- Number: 0, 1, 2, 3 -->
 <P4150>0</P4150>
@@ -1674,16 +1674,16 @@
 <!-- Enable Port (0 - No, 1 - Yes) -->
 
 <!-- String -->
-<P4061>{$user_id_2}</P4061>
+<P4061>{$account.2.user_id}</P4061>
 
 <!-- String -->
-<P4091>{$user_id_2}</P4091>
+<P4091>{$account.2.user_id}</P4091>
 
 <!-- String -->
-<P4121>{$user_password_2}</P4121>
+<P4121>{$account.2.password}</P4121>
 
 <!-- String -->
-<P4181>{$display_name_2}</P4181>
+<P4181>{$account.2.display_name}</P4181>
 
 <!-- Number: 0, 1, 2, 3 -->
 <P4151>0</P4151>
@@ -1699,16 +1699,16 @@
 <!-- Enable Port (0 - No, 1 - Yes) -->
 
 <!-- String -->
-<P4062>{$user_id_3}</P4062>
+<P4062>{$account.3.user_id}</P4062>
 
 <!-- String -->
-<P4092>{$user_id_3}</P4092>
+<P4092>{$account.3.user_id}</P4092>
 
 <!-- String -->
-<P4122>{$user_password_3}</P4122>
+<P4122>{$account.3.password}</P4122>
 
 <!-- String -->
-<P4182>{$display_name_3}</P4182>
+<P4182>{$account.3.display_name}</P4182>
 
 <!-- Number: 0, 1, 2, 3 -->
 <P4152>0</P4152>
@@ -1724,16 +1724,16 @@
 <!-- Enable Port (0 - No, 1 - Yes) -->
 
 <!-- String -->
-<P4063>{$user_id_4}</P4063>
+<P4063>{$account.4.user_id}</P4063>
 
 <!-- String -->
-<P4093>{$user_id_4}</P4093>
+<P4093>{$account.4.user_id}</P4093>
 
 <!-- String -->
-<P4123>{$user_password_3}</P4123>
+<P4123>{$account.4.password}</P4123>
 
 <!-- String -->
-<P4183>{$display_name_4}</P4183>
+<P4183>{$account.4.display_name}</P4183>
 
 <!-- Number: 0, 1, 2, 3 -->
 <P4153>1</P4153>