diff --git a/resources/templates/provision/cisco/spa122/{$mac}.xml b/resources/templates/provision/cisco/spa122/{$mac}.xml
index 38fc92c545..4262d5d48b 100644
--- a/resources/templates/provision/cisco/spa122/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa122/{$mac}.xml
@@ -158,8 +158,8 @@
 <RTP_CoS_Value_1_>6</RTP_CoS_Value_1_>
 <Network_Jitter_Level_1_>high</Network_Jitter_Level_1_>
 <Jitter_Buffer_Adjustment_1_>Yes</Jitter_Buffer_Adjustment_1_>
-<SIP_Transport_1_>{$sip_transport_1|upper}</SIP_Transport_1_>
-<SIP_Port_1_>{$sip_port_1}</SIP_Port_1_>
+<SIP_Transport_1_>{$account.1.sip_transport|upper}</SIP_Transport_1_>
+<SIP_Port_1_>{$account.1.sip_port}</SIP_Port_1_>
 <SIP_100REL_Enable_1_>No</SIP_100REL_Enable_1_>
 <EXT_SIP_Port_1_></EXT_SIP_Port_1_>
 <Auth_Resync-Reboot_1_>Yes</Auth_Resync-Reboot_1_>
@@ -187,12 +187,12 @@
 <Emergency_Number_1_></Emergency_Number_1_>
 <Mailbox_ID_1_></Mailbox_ID_1_>
 <Proxy_1_>{$domain_name}</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_>
+<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_>Yes</Use_OB_Proxy_In_Dialog_1_>
 <Register_1_>Yes</Register_1_>
 <Make_Call_Without_Reg_1_>No</Make_Call_Without_Reg_1_>
-<Register_Expires_1_>{$register_expires_1}</Register_Expires_1_>
+<Register_Expires_1_>{$account.1.register_expires}</Register_Expires_1_>
 <Ans_Call_Without_Reg_1_>No</Ans_Call_Without_Reg_1_>
 <Use_DNS_SRV_1_>No</Use_DNS_SRV_1_>
 <DNS_SRV_Auto_Prefix_1_>No</DNS_SRV_Auto_Prefix_1_>
@@ -200,9 +200,9 @@
 <Proxy_Redundancy_Method_1_>Normal</Proxy_Redundancy_Method_1_>
 <Mailbox_Subscribe_URL_1_></Mailbox_Subscribe_URL_1_>
 <Mailbox_Subscribe_Expires_1_></Mailbox_Subscribe_Expires_1_>
-<Display_Name_1_>{$display_name_1}</Display_Name_1_>
-<User_ID_1_>{$user_id_1}</User_ID_1_>
-<Password_1_>{$user_password_1}</Password_1_>
+<Display_Name_1_>{$account.1.display_name}</Display_Name_1_>
+<User_ID_1_>{$account.1.user_id}</User_ID_1_>
+<Password_1_>{$account.1.password}</Password_1_>
 <Use_Auth_ID_1_>No</Use_Auth_ID_1_>
 <Auth_ID_1_></Auth_ID_1_>
 <Resident_Online_Number_1_></Resident_Online_Number_1_>
@@ -313,8 +313,8 @@
 <Emergency_Number_2_></Emergency_Number_2_>
 <Mailbox_ID_2_></Mailbox_ID_2_>
 <Proxy_2_>{$domain_name}</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_>
+<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_>Yes</Use_OB_Proxy_In_Dialog_2_>
 <Register_2_>Yes</Register_2_>
 <Make_Call_Without_Reg_2_>No</Make_Call_Without_Reg_2_>
@@ -327,9 +327,9 @@
 <Proxy_Redundancy_Method_2_>Normal</Proxy_Redundancy_Method_2_>
 <Mailbox_Subscribe_URL_2_></Mailbox_Subscribe_URL_2_>
 <Mailbox_Subscribe_Expires_2_></Mailbox_Subscribe_Expires_2_>
-<Display_Name_2_>{$display_name_2}</Display_Name_2_>
-<User_ID_2_>{$user_id_2}</User_ID_2_>
-<Password_2_>{$user_password_2}</Password_2_>
+<Display_Name_2_>{$account.2.display_name}</Display_Name_2_>
+<User_ID_2_>{$account.2.user_id}</User_ID_2_>
+<Password_2_>{$account.2.password}</Password_2_>
 <Use_Auth_ID_2_>No</Use_Auth_ID_2_>
 <Auth_ID_2_></Auth_ID_2_>
 <Resident_Online_Number_2_></Resident_Online_Number_2_>