diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
index 26c9858f11..004f099220 100644
--- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
@@ -27,7 +27,7 @@
 		<!-- Profile Active.  0 - no, 1 - yes, Number: 0,1. -->
 		<P271>1</P271>
 		<!-- Primary SIP Server,String: serveraddress -->
-		<P47>{$server_address_1}</P47>
+		<P47>{$account.1.server_address}</P47>
 		<!-- Prefer Primary SIP Server. 0 - No, 1 - Yes. -->
 		<P4567>1</P4567>
 		<!-- SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS -->
@@ -43,10 +43,10 @@
 		<!-- FXS Port 1,SIP USER ID, Authenticate ID, Password, Name, Profile ID (0 - Profile 1, 1 - Profile 2, 2 - Profile 3) -->
 		<!-- Hunting Group (0 - None, 1 - Active, 2 - 2, 3 - 3, 4 -4, 5 - 5, 6 - 6, 7 - 7, 8 - 8 ) -->
 		<!-- Request URI Routing ID, Enable Port(0 - No, 1 - Yes, default is Yes) -->
-		<P4060>{$user_id_1}</P4060>
-		<P4090>{$user_id_1}</P4090>
-		<P4120>{$user_password_1}</P4120>
-		<P4180>{$display_name_1}</P4180>
+		<P4060>{$account.1.user_id}</P4060>
+		<P4090>{$account.1.user_id}</P4090>
+		<P4120>{$account.1.password}</P4120>
+		<P4180>{$account.1.display_name}</P4180>
 		<P4150>0</P4150>
 		<P4300>0</P4300>
 		<P4669></P4669>
@@ -55,10 +55,10 @@
 		<!-- FXS Port 2. SIP USER ID, Authenticate ID, Password, Name, Profile ID (0 - Profile 1, 1 - Profile 2, 2 - Profile 3) -->
 		<!-- Hunting Group (0 - None, 2 - Active, 1 - 1, 3 - 3, 4 -4, 5 - 5, 6 - 6, 7 - 7, 8 - 8 ) -->
 		<!-- Request URI Routing ID.Enable Port(0 - No, 1 - Yes, default is Yes) -->
-		<P4061>{$user_id_2}</P4061>
-		<P4091>{$user_id_2}</P4091>
-		<P4121>{$user_password_2}</P4121>
-		<P4181>{$display_name_2}</P4181>
+		<P4061>{$account.2.user_id}</P4061>
+		<P4091>{$account.2.user_id}</P4091>
+		<P4121>{$account.2.password}</P4121>
+		<P4181>{$account.2.display_name}</P4181>
 		<P4151>0</P4151>
 		<P4301>0</P4301>
 		<P4670></P4670>
@@ -67,10 +67,10 @@
 		<!-- FXS Port 3. SIP USER ID, Authenticate ID, Password, Name, Profile ID (0 - Profile 1, 1 - Profile 2, 2 - Profile 3) -->
 		<!-- Hunting Group (0 - None, 3 - Active, 1 - 1, 2 - 2, 4 -4, 5 - 5, 6 - 6, 7 - 7, 8 - 8 ) -->
 		<!-- Request URI Routing ID. Enable Port(0 - No, 1 - Yes, default is Yes) -->
-		<P4062>{$user_id_3}</P4062>
-		<P4092>{$user_id_3}</P4092>
-		<P4122>{$user_password_3}</P4122>
-		<P4182>{$display_name_3}</P4182>
+		<P4062>{$account.3.user_id}</P4062>
+		<P4092>{$account.3.user_id}</P4092>
+		<P4122>{$account.3.password}</P4122>
+		<P4182>{$account.3.display_name}</P4182>
 		<P4152>0</P4152>
 		<P4302>0</P4302>
 		<P4671></P4671>
@@ -79,10 +79,10 @@
 		<!-- FXS Port 4. SIP USER ID, Authenticate ID, Password, Name, Profile ID (0 - Profile 1, 1 - Profile 2, 2 - Profile 3) -->
 		<!-- Hunting Group (0 - None, 4 - Active, 1 - 1, 2 - 2, 3 - 3, 5 - 5, 6 - 6, 7 - 7, 8 - 8 ) -->
 		<!-- Request URI Routing ID. Enable Port(0 - No, 1 - Yes, default is Yes) -->
-		<P4063>{$user_id_4}</P4063>
-		<P4093>{$user_id_4}</P4093>
-		<P4123>{$user_password_4}</P4123>
-		<P4183>{$display_name_4}</P4183>
+		<P4063>{$account.4.user_id}</P4063>
+		<P4093>{$account.4.user_id}</P4093>
+		<P4123>{$account.4.password}</P4123>
+		<P4183>{$account.4.display_name}</P4183>
 		<P4153>0</P4153>
 		<P4303>0</P4303>
 		<P4672></P4672>