diff --git a/resources/templates/provision/cisco/spa112/{$mac}.xml b/resources/templates/provision/cisco/spa112/{$mac}.xml
index 6434784d91..6834de93a7 100644
--- a/resources/templates/provision/cisco/spa112/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa112/{$mac}.xml
@@ -21,15 +21,15 @@
 <Line_Enable_1_>Yes</Line_Enable_1_>
 <Mailbox_ID_1_>*97</Mailbox_ID_1_>
 <Proxy_1_>{$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_>
-<SIP_Transport_1_ group="Ext_1/SIP_Settings">{$sip_transport_1|upper}</SIP_Transport_1_>
-<SIP_Port_1_ group="Ext_1/SIP_Settings">{$sip_port_1}</SIP_Port_1_>
-<Register_Expires_1_ group="Ext_1/Proxy_and_Registration">{$register_expires_1}</Register_Expires_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_>
+<SIP_Transport_1_ group="Ext_1/SIP_Settings">{$account.1.sip_transport|upper}</SIP_Transport_1_>
+<SIP_Port_1_ group="Ext_1/SIP_Settings">{$account.1.sip_port}</SIP_Port_1_>
+<Register_Expires_1_ group="Ext_1/Proxy_and_Registration">{$account.1.register_expires}</Register_Expires_1_>
 <Register_1_>Yes</Register_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_>
 <Call_Waiting_Serv_1_>{$spa_call_waiting}</Call_Waiting_Serv_1_>  
@@ -37,16 +37,16 @@
 <!--<Dial_Plan_1_>(&lt;:31516&gt;xxxxxxx|&lt;:3&gt;xxxxxxxxxx|&lt;:3&gt;xxxxxxxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)</Dial_Plan_1_>-->
 <Line_Enable_2_>Yes</Line_Enable_2_>
 <Mailbox_ID_2_>*97</Mailbox_ID_2_>
-<Proxy_2_>{$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_>{$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_>
 <Register_2_>Yes</Register_2_>
-<SIP_Transport_2_ group="Ext_1/SIP_Settings">{$sip_transport_2|upper}</SIP_Transport_2_>
-<SIP_Port_2_ group="Ext_1/SIP_Settings">{$sip_port_2}</SIP_Port_2_>
-<Register_Expires_2_ group="Ext_2/Proxy_and_Registration">{$register_expires_2}</Register_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_>
+<SIP_Transport_2_ group="Ext_1/SIP_Settings">{$account.2.sip_transport|upper}</SIP_Transport_2_>
+<SIP_Port_2_ group="Ext_1/SIP_Settings">{$account.2.sip_port}</SIP_Port_2_>
+<Register_Expires_2_ group="Ext_2/Proxy_and_Registration">{$account.2.register_expires}</Register_Expires_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_>
 <Dial_Plan_2_>{$spa_dial_plan}</Dial_Plan_2_>