diff --git a/resources/templates/provision/cisco/spa303/{$mac}.xml b/resources/templates/provision/cisco/spa303/{$mac}.xml
index 81c3ae0f5a..864e8e07e2 100644
--- a/resources/templates/provision/cisco/spa303/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa303/{$mac}.xml
@@ -250,8 +250,8 @@
 <Jitter_Buffer_Adjustment_1_ ua="na">up and down</Jitter_Buffer_Adjustment_1_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_1_ ua="na">{$sip_transport_1|upper}</SIP_Transport_1_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_1_ ua="na">{$sip_port_1}</SIP_Port_1_>
+<SIP_Transport_1_ ua="na">{$account.1.sip_transport|upper}</SIP_Transport_1_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_1_ ua="na">{$account.1.sip_port}</SIP_Port_1_>
 <SIP_100REL_Enable_1_ ua="na">No</SIP_100REL_Enable_1_>
 <EXT_SIP_Port_1_ ua="na"></EXT_SIP_Port_1_>
 <Auth_Resync-Reboot_1_ ua="na">Yes</Auth_Resync-Reboot_1_>
@@ -288,13 +288,13 @@
 <Auto_Ans_Page_On_Active_Call_1_ ua="na">Yes</Auto_Ans_Page_On_Active_Call_1_>
 
 <!-- Proxy and Registration -->
-<Proxy_1_ ua="na">{$server_address_1}</Proxy_1_>
-<Outbound_Proxy_1_>{$outbound_proxy_primary_1}</Outbound_Proxy_1_>
-<Use_Outbound_Proxy_1_>{if isset ($outbound_proxy_primary_1)}Yes{else}No{/if}</Use_Outbound_Proxy_1_>
+<Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+<Outbound_Proxy_1_>{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+<Use_Outbound_Proxy_1_>{if isset ($account.1.outbound_proxy_primary)}Yes{else}No{/if}</Use_Outbound_Proxy_1_>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
 <Register_1_ ua="na">Yes</Register_1_>
 <Make_Call_Without_Reg_1_ ua="na">No</Make_Call_Without_Reg_1_>
-<Register_Expires_1_ ua="na">{$register_expires_1}</Register_Expires_1_>
+<Register_Expires_1_ ua="na">{$account.1.register_expires}</Register_Expires_1_>
 <Ans_Call_Without_Reg_1_ ua="na">No</Ans_Call_Without_Reg_1_>
 <Use_DNS_SRV_1_ ua="na">No</Use_DNS_SRV_1_>
 <DNS_SRV_Auto_Prefix_1_ ua="na">No</DNS_SRV_Auto_Prefix_1_>
@@ -302,9 +302,9 @@
 <Proxy_Redundancy_Method_1_ ua="na">Normal</Proxy_Redundancy_Method_1_> <!-- options: Normal/Based on SRV Port -->
 
 <!-- Subscriber Information -->
-<Display_Name_1_ ua="na">{$display_name_1}</Display_Name_1_>
-<User_ID_1_ ua="na">{$user_id_1}</User_ID_1_>
-<Password_1_ ua="na">{$user_password_1}</Password_1_>
+<Display_Name_1_ ua="na">{$account.1.display_name}</Display_Name_1_>
+<User_ID_1_ ua="na">{$account.1.user_id}</User_ID_1_>
+<Password_1_ ua="na">{$account.1.password}</Password_1_>
 <Use_Auth_ID_1_ ua="na">No</Use_Auth_ID_1_>
 <Auth_ID_1_ ua="na"></Auth_ID_1_>
 <Mini_Certificate_1_ ua="na"></Mini_Certificate_1_>
@@ -362,8 +362,8 @@
 <Jitter_Buffer_Adjustment_2_ ua="na">up and down</Jitter_Buffer_Adjustment_2_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_2_ ua="na">{$sip_transport_2|upper}</SIP_Transport_2_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_2_ ua="na">{$sip_port_2}</SIP_Port_2_>
+<SIP_Transport_2_ ua="na">{$account.2.sip_transport|upper}</SIP_Transport_2_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_2_ ua="na">{$account.2.sip_port}</SIP_Port_2_>
 <SIP_100REL_Enable_2_ ua="na">No</SIP_100REL_Enable_2_>
 <EXT_SIP_Port_2_ ua="na"></EXT_SIP_Port_2_>
 <Auth_Resync-Reboot_2_ ua="na">Yes</Auth_Resync-Reboot_2_>
@@ -400,9 +400,9 @@
 <Auto_Ans_Page_On_Active_Call_2_ ua="na">Yes</Auto_Ans_Page_On_Active_Call_2_>
 
 <!-- Proxy and Registration -->
-<Proxy_2_ ua="na">{$server_address_2}</Proxy_2_>
-<Outbound_Proxy_2_>{$outbound_proxy_primary_2}</Outbound_Proxy_2_>
-<Use_Outbound_Proxy_2_>{if isset ($outbound_proxy_primary_2)}Yes{else}No{/if}</Use_Outbound_Proxy_2_>
+<Proxy_2_ ua="na">{$account.2.server_address}</Proxy_2_>
+<Outbound_Proxy_2_>{$account.2.outbound_proxy_primary}</Outbound_Proxy_2_>
+<Use_Outbound_Proxy_2_>{if isset ($account.2.outbound_proxy_primary)}Yes{else}No{/if}</Use_Outbound_Proxy_2_>
 <Use_OB_Proxy_In_Dialog_2_ ua="na">Yes</Use_OB_Proxy_In_Dialog_2_>
 <Register_2_ ua="na">Yes</Register_2_>
 <Make_Call_Without_Reg_2_ ua="na">No</Make_Call_Without_Reg_2_>
@@ -414,9 +414,9 @@
 <Proxy_Redundancy_Method_2_ ua="na">Normal</Proxy_Redundancy_Method_2_> <!-- options: Normal/Based on SRV Port -->
 
 <!-- Subscriber Information -->
-<Display_Name_2_ ua="na">{$display_name_2}</Display_Name_2_>
-<User_ID_2_ ua="na">{$user_id_2}</User_ID_2_>
-<Password_2_ ua="na">{$user_password_2}</Password_2_>
+<Display_Name_2_ ua="na">{$account.2.display_name}</Display_Name_2_>
+<User_ID_2_ ua="na">{$account.2.user_id}</User_ID_2_>
+<Password_2_ ua="na">{$account.2.password}</Password_2_>
 <Use_Auth_ID_2_ ua="na">No</Use_Auth_ID_2_>
 <Auth_ID_2_ ua="na"></Auth_ID_2_>
 <Mini_Certificate_2_ ua="na"></Mini_Certificate_2_>
@@ -474,8 +474,8 @@
 <Jitter_Buffer_Adjustment_3_ ua="na">up and down</Jitter_Buffer_Adjustment_3_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_3_ ua="na">{$sip_transport_3|upper}</SIP_Transport_3_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_3_ ua="na">{$sip_port_3}</SIP_Port_3_>
+<SIP_Transport_3_ ua="na">{$account.3.sip_transport|upper}</SIP_Transport_3_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_3_ ua="na">{$account.3.sip_port}</SIP_Port_3_>
 <SIP_100REL_Enable_3_ ua="na">No</SIP_100REL_Enable_3_>
 <EXT_SIP_Port_3_ ua="na"></EXT_SIP_Port_3_>
 <Auth_Resync-Reboot_3_ ua="na">Yes</Auth_Resync-Reboot_3_>
@@ -512,7 +512,7 @@
 <Auto_Ans_Page_On_Active_Call_3_ ua="na">Yes</Auto_Ans_Page_On_Active_Call_3_>
 
 <!-- Proxy and Registration -->
-<Proxy_3_ ua="na">{$server_address_3}</Proxy_3_>
+<Proxy_3_ ua="na">{$account.3.server_address}</Proxy_3_>
 <Outbound_Proxy_3_ ua="na"></Outbound_Proxy_3_>
 <Use_Outbound_Proxy_3_ ua="na">No</Use_Outbound_Proxy_3_>
 <Use_OB_Proxy_In_Dialog_3_ ua="na">Yes</Use_OB_Proxy_In_Dialog_3_>
@@ -586,8 +586,8 @@
 <Jitter_Buffer_Adjustment_4_ ua="na">up and down</Jitter_Buffer_Adjustment_4_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_4_ ua="na">{$sip_transport_4|upper}</SIP_Transport_4_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_4_ ua="na">{$sip_port_4}</SIP_Port_4_>
+<SIP_Transport_4_ ua="na">{$account.4.sip_transport|upper}</SIP_Transport_4_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_4_ ua="na">{$account.4.sip_port}</SIP_Port_4_>
 <SIP_100REL_Enable_4_ ua="na">No</SIP_100REL_Enable_4_>
 <EXT_SIP_Port_4_ ua="na"></EXT_SIP_Port_4_>
 <Auth_Resync-Reboot_4_ ua="na">Yes</Auth_Resync-Reboot_4_>
@@ -630,7 +630,7 @@
 <Use_OB_Proxy_In_Dialog_4_ ua="na">Yes</Use_OB_Proxy_In_Dialog_4_>
 <Register_4_ ua="na">Yes</Register_4_>
 <Make_Call_Without_Reg_4_ ua="na">No</Make_Call_Without_Reg_4_>
-<Register_Expires_4_ ua="na">{$register_expires_4}</Register_Expires_4_>
+<Register_Expires_4_ ua="na">{$account.4.register_expires}</Register_Expires_4_>
 <Ans_Call_Without_Reg_4_ ua="na">No</Ans_Call_Without_Reg_4_>
 <Use_DNS_SRV_4_ ua="na">No</Use_DNS_SRV_4_>
 <DNS_SRV_Auto_Prefix_4_ ua="na">No</DNS_SRV_Auto_Prefix_4_>
@@ -698,8 +698,8 @@
 <Jitter_Buffer_Adjustment_5_ ua="na">up and down</Jitter_Buffer_Adjustment_5_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_5_ ua="na">{$sip_transport_5|upper}</SIP_Transport_5_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_5_ ua="na">{$sip_port_5}</SIP_Port_5_>
+<SIP_Transport_5_ ua="na">{$account.5.sip_transport|upper}</SIP_Transport_5_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_5_ ua="na">{$account.5.sip_port}</SIP_Port_5_>
 <SIP_100REL_Enable_5_ ua="na">No</SIP_100REL_Enable_5_>
 <EXT_SIP_Port_5_ ua="na"></EXT_SIP_Port_5_>
 <Auth_Resync-Reboot_5_ ua="na">Yes</Auth_Resync-Reboot_5_>
@@ -810,8 +810,8 @@
 <Jitter_Buffer_Adjustment_6_ ua="na">up and down</Jitter_Buffer_Adjustment_6_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_6_ ua="na">{$sip_transport_6|upper}</SIP_Transport_6_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_6_ ua="na">{$sip_port_6}</SIP_Port_6_>
+<SIP_Transport_6_ ua="na">{$account.6.sip_transport|upper}</SIP_Transport_6_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_6_ ua="na">{$account.6.sip_port}</SIP_Port_6_>
 <SIP_100REL_Enable_6_ ua="na">No</SIP_100REL_Enable_6_>
 <EXT_SIP_Port_6_ ua="na"></EXT_SIP_Port_6_>
 <Auth_Resync-Reboot_6_ ua="na">Yes</Auth_Resync-Reboot_6_>
@@ -854,7 +854,7 @@
 <Use_OB_Proxy_In_Dialog_6_ ua="na">Yes</Use_OB_Proxy_In_Dialog_6_>
 <Register_6_ ua="na">Yes</Register_6_>
 <Make_Call_Without_Reg_6_ ua="na">No</Make_Call_Without_Reg_6_>
-<Register_Expires_6_ ua="na">{$register_expires_6}</Register_Expires_6_>
+<Register_Expires_6_ ua="na">{$account.6.register_expires}</Register_Expires_6_>
 <Ans_Call_Without_Reg_6_ ua="na">No</Ans_Call_Without_Reg_6_>
 <Use_DNS_SRV_6_ ua="na">No</Use_DNS_SRV_6_>
 <DNS_SRV_Auto_Prefix_6_ ua="na">No</DNS_SRV_Auto_Prefix_6_>
@@ -922,8 +922,8 @@
 <Jitter_Buffer_Adjustment_7_ ua="na">up and down</Jitter_Buffer_Adjustment_7_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_7_ ua="na">{$sip_transport_7|upper}</SIP_Transport_7_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_7_ ua="na">{$sip_port_7}</SIP_Port_7_>
+<SIP_Transport_7_ ua="na">{$account.7.sip_transport|upper}</SIP_Transport_7_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_7_ ua="na">{$account.7.sip_port}</SIP_Port_7_>
 <SIP_100REL_Enable_7_ ua="na">No</SIP_100REL_Enable_7_>
 <EXT_SIP_Port_7_ ua="na"></EXT_SIP_Port_7_>
 <Auth_Resync-Reboot_7_ ua="na">Yes</Auth_Resync-Reboot_7_>
@@ -966,7 +966,7 @@
 <Use_OB_Proxy_In_Dialog_7_ ua="na">Yes</Use_OB_Proxy_In_Dialog_7_>
 <Register_7_ ua="na">Yes</Register_7_>
 <Make_Call_Without_Reg_7_ ua="na">No</Make_Call_Without_Reg_7_>
-<Register_Expires_7_ ua="na">{$register_expires_7}</Register_Expires_7_>
+<Register_Expires_7_ ua="na">{$account.7.register_expires}</Register_Expires_7_>
 <Ans_Call_Without_Reg_7_ ua="na">No</Ans_Call_Without_Reg_7_>
 <Use_DNS_SRV_7_ ua="na">No</Use_DNS_SRV_7_>
 <DNS_SRV_Auto_Prefix_7_ ua="na">No</DNS_SRV_Auto_Prefix_7_>
@@ -1034,8 +1034,8 @@
 <Jitter_Buffer_Adjustment_8_ ua="na">up and down</Jitter_Buffer_Adjustment_8_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_8_ ua="na">{$sip_transport_8|upper}</SIP_Transport_8_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_8_ ua="na">{$sip_port_8}</SIP_Port_8_>
+<SIP_Transport_8_ ua="na">{$account.8.sip_transport|upper}</SIP_Transport_8_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_8_ ua="na">{$account.8.sip_port}</SIP_Port_8_>
 <SIP_100REL_Enable_8_ ua="na">No</SIP_100REL_Enable_8_>
 <EXT_SIP_Port_8_ ua="na"></EXT_SIP_Port_8_>
 <Auth_Resync-Reboot_8_ ua="na">Yes</Auth_Resync-Reboot_8_>
@@ -1078,7 +1078,7 @@
 <Use_OB_Proxy_In_Dialog_8_ ua="na">Yes</Use_OB_Proxy_In_Dialog_8_>
 <Register_8_ ua="na">Yes</Register_8_>
 <Make_Call_Without_Reg_8_ ua="na">No</Make_Call_Without_Reg_8_>
-<Register_Expires_8_ ua="na">{$register_expires_8}</Register_Expires_8_>
+<Register_Expires_8_ ua="na">{$account.8.register_expires}</Register_Expires_8_>
 <Ans_Call_Without_Reg_8_ ua="na">No</Ans_Call_Without_Reg_8_>
 <Use_DNS_SRV_8_ ua="na">No</Use_DNS_SRV_8_>
 <DNS_SRV_Auto_Prefix_8_ ua="na">No</DNS_SRV_Auto_Prefix_8_>
@@ -1146,8 +1146,8 @@
 <Jitter_Buffer_Adjustment_9_ ua="na">up and down</Jitter_Buffer_Adjustment_9_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_9_ ua="na">{$sip_transport_9|upper}</SIP_Transport_9_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_9_ ua="na">{$sip_port_9}</SIP_Port_9_>
+<SIP_Transport_9_ ua="na">{$account.9.sip_transport|upper}</SIP_Transport_9_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_9_ ua="na">{$account.9.sip_port}</SIP_Port_9_>
 <SIP_100REL_Enable_9_ ua="na">No</SIP_100REL_Enable_9_>
 <EXT_SIP_Port_9_ ua="na"></EXT_SIP_Port_9_>
 <Auth_Resync-Reboot_9_ ua="na">Yes</Auth_Resync-Reboot_9_>
@@ -1190,7 +1190,7 @@
 <Use_OB_Proxy_In_Dialog_9_ ua="na">Yes</Use_OB_Proxy_In_Dialog_9_>
 <Register_9_ ua="na">Yes</Register_9_>
 <Make_Call_Without_Reg_9_ ua="na">No</Make_Call_Without_Reg_9_>
-<Register_Expires_9_ ua="na">{$register_expires_9}</Register_Expires_9_>
+<Register_Expires_9_ ua="na">{$account.9.register_expires}</Register_Expires_9_>
 <Ans_Call_Without_Reg_9_ ua="na">No</Ans_Call_Without_Reg_9_>
 <Use_DNS_SRV_9_ ua="na">No</Use_DNS_SRV_9_>
 <DNS_SRV_Auto_Prefix_9_ ua="na">No</DNS_SRV_Auto_Prefix_9_>
@@ -1258,8 +1258,8 @@
 <Jitter_Buffer_Adjustment_10_ ua="na">up and down</Jitter_Buffer_Adjustment_10_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_10_ ua="na">{$sip_transport_10|upper}</SIP_Transport_10_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_10_ ua="na">{$sip_port_10}</SIP_Port_10_>
+<SIP_Transport_10_ ua="na">{$account.10.sip_transport|upper}</SIP_Transport_10_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_10_ ua="na">{$account.10.sip_port}</SIP_Port_10_>
 <SIP_100REL_Enable_10_ ua="na">No</SIP_100REL_Enable_10_>
 <EXT_SIP_Port_10_ ua="na"></EXT_SIP_Port_10_>
 <Auth_Resync-Reboot_10_ ua="na">Yes</Auth_Resync-Reboot_10_>
@@ -1370,8 +1370,8 @@
 <Jitter_Buffer_Adjustment_11_ ua="na">up and down</Jitter_Buffer_Adjustment_11_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_11_ ua="na">{$sip_transport_11|upper}</SIP_Transport_11_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_11_ ua="na">{$sip_port_11}</SIP_Port_11_>
+<SIP_Transport_11_ ua="na">{$account.11.sip_transport|upper}</SIP_Transport_11_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_11_ ua="na">{$account.11.sip_port}</SIP_Port_11_>
 <SIP_100REL_Enable_11_ ua="na">No</SIP_100REL_Enable_11_>
 <EXT_SIP_Port_11_ ua="na"></EXT_SIP_Port_11_>
 <Auth_Resync-Reboot_11_ ua="na">Yes</Auth_Resync-Reboot_11_>
@@ -1482,8 +1482,8 @@
 <Jitter_Buffer_Adjustment_12_ ua="na">up and down</Jitter_Buffer_Adjustment_12_> <!-- options: up and down/up only/down only/disable -->
 
 <!-- SIP Settings -->
-<SIP_Transport_12_ ua="na">{$sip_transport_12|upper}</SIP_Transport_12_> <!-- options: UDP/TCP/TLS -->
-<SIP_Port_12_ ua="na">{$sip_port_12}</SIP_Port_12_>
+<SIP_Transport_12_ ua="na">{$account.12.sip_transport|upper}</SIP_Transport_12_> <!-- options: UDP/TCP/TLS -->
+<SIP_Port_12_ ua="na">{$account.12.sip_port}</SIP_Port_12_>
 <SIP_100REL_Enable_12_ ua="na">No</SIP_100REL_Enable_12_>
 <EXT_SIP_Port_12_ ua="na"></EXT_SIP_Port_12_>
 <Auth_Resync-Reboot_12_ ua="na">Yes</Auth_Resync-Reboot_12_>