diff --git a/resources/templates/provision/sangoma/s300/{$mac}.xml b/resources/templates/provision/sangoma/s300/{$mac}.xml
index 23ae261d5a..0c8273e9bc 100644
--- a/resources/templates/provision/sangoma/s300/{$mac}.xml
+++ b/resources/templates/provision/sangoma/s300/{$mac}.xml
@@ -3,19 +3,19 @@
     <config version="1">
         <!--Account1/Basic-->
         <P271 para="Account1.Active">1</P271>
-        <P47 para="Account1.Sipserver">{$server_address_1}</P47>
+        <P47 para="Account1.Sipserver">{$account.1.server_address}</P47>
         <P967 para="Account1.FailoverSipserver" />
         <P8851 para="Account1.SecondFailoverSipserver" />
         <P4567 para="Account1.PreferPrimaryServer">0</P4567>
-        <P48 para="Account1.OutboundProxy">{$outbound_proxy_primary_1}</P48>
-        <P20047 para="Account1.BackUpOutboundProxy">{$outbound_proxy_secondary_1}</P20047>
+        <P48 para="Account1.OutboundProxy">{$account.1.outbound_proxy_primary}</P48>
+        <P20047 para="Account1.BackUpOutboundProxy">{$account.1.outbound_proxy_secondary}</P20047>
         <P130 para="Account1.SipTransport">{$sangoma_transport}</P130>
         <P52 para="Account1.NatTraversal">2</P52>
-        <P20000 para="Account1.Lable">{$display_name_1}</P20000>
-        <P35 para="Account1.SipUserId">{$user_id_1}</P35>
-        <P36 para="Account1.AuthenticateID">{$auth_id_1}</P36>
-        <P34 para="Account1.AuthenticatePassword">{$user_password_1}</P34>
-        <P3 para="Account1.DispalyName">{$display_name_1}</P3>
+        <P20000 para="Account1.Lable">{$account.1.display_name}</P20000>
+        <P35 para="Account1.SipUserId">{$account.1.user_id}</P35>
+        <P36 para="Account1.AuthenticateID">{$account.1.auth_id}</P36>
+        <P34 para="Account1.AuthenticatePassword">{$account.1.password}</P34>
+        <P3 para="Account1.DispalyName">{$account.1.display_name}</P3>
         <P103 para="Account1.DnsMode">{$sangoma_dns_mode}</P103>
         <P63 para="Account1.UserIdIsPhoneNumber">0</P63>
         <P31 para="Account1.SipRegistration">1</P31>
@@ -132,19 +132,19 @@
         <P20976 para="Account1.SCABargeIn">0</P20976>
         <!--Account2/Basic-->
         <P401 para="Account2.Active">1</P401>
-        <P747 para="Account2.Sipserver">{$server_address_2}</P747>
+        <P747 para="Account2.Sipserver">{$account.2.server_address}</P747>
         <P987 para="Account2.FailoverSipserver" />
         <P8852 para="Account2.SecondFailoverSipserver" />
         <P4568 para="Account2.PreferPrimaryServer">0</P4568>
-        <P748 para="Account2.OutboundProxy">{$outbound_proxy_primary_2}</P748>
-        <P20048 para="Account2.BackUpOutboundProxy">{$outbound_proxy_secondary_2}</P20048>
+        <P748 para="Account2.OutboundProxy">{$account.2.outbound_proxy_primary}</P748>
+        <P20048 para="Account2.BackUpOutboundProxy">{$account.2.outbound_proxy_secondary}</P20048>
         <P830 para="Account2.SipTransport">{$sangoma_transport}</P830>
         <P730 para="Account2.NatTraversal">2</P730>
-        <P20001 para="Account2.Lable">{$display_name_2}</P20001>
-        <P735 para="Account2.SipUserId">{$user_id_2}</P735>
-        <P736 para="Account2.AuthenticateID">{$auth_id_2}</P736>
-        <P734 para="Account2.AuthenticatePassword">{$user_password_2}</P734>
-        <P703 para="Account2.DispalyName">{$display_name_2}</P703>
+        <P20001 para="Account2.Lable">{$account.2.display_name}</P20001>
+        <P735 para="Account2.SipUserId">{$account.2.user_id}</P735>
+        <P736 para="Account2.AuthenticateID">{$account.2.auth_id}</P736>
+        <P734 para="Account2.AuthenticatePassword">{$account.2.password}</P734>
+        <P703 para="Account2.DispalyName">{$account.2.display_name}</P703>
         <P702 para="Account2.DnsMode">0</P702>
         <P763 para="Account2.UserIdIsPhoneNumber">0</P763>
         <P731 para="Account2.SipRegistration">1</P731>
@@ -261,19 +261,19 @@
         <P20977 para="Account2.SCABargeIn">0</P20977>
         <!--Account3/Basic-->
         <P501 para="Account3.Active">1</P501>
-        <P502 para="Account3.Sipserver">{$server_address_3}</P502>
+        <P502 para="Account3.Sipserver">{$server_address}</P502>
         <P988 para="Account3.FailoverSipserver" />
         <P8853 para="Account3.SecondFailoverSipserver" />
         <P4569 para="Account3.PreferPrimaryServer">0</P4569>
-        <P503 para="Account3.OutboundProxy">{$outbound_proxy_primary_3}</P503>
-        <P20049 para="Account3.BackUpOutboundProxy">{$outbound_proxy_secondary_3}</P20049>
+        <P503 para="Account3.OutboundProxy">{$account.3.outbound_proxy_primary}</P503>
+        <P20049 para="Account3.BackUpOutboundProxy">{$account.3.outbound_proxy_secondary}</P20049>
         <P930 para="Account3.SipTransport">{$sangoma_transport}</P930>
         <P514 para="Account3.NatTraversal">2</P514>
-        <P20002 para="Account3.Lable">{$display_name_3}</P20002>
-        <P504 para="Account3.SipUserId">{$user_id_3}</P504>
-        <P505 para="Account3.AuthenticateID">{$auth_id_3}</P505>
-        <P506 para="Account3.AuthenticatePassword">{$user_password_3}</P506>
-        <P507 para="Account3.DispalyName">{$display_name_3}</P507>
+        <P20002 para="Account3.Lable">{$account.3.display_name}</P20002>
+        <P504 para="Account3.SipUserId">{$account.3.user_id}</P504>
+        <P505 para="Account3.AuthenticateID">{$account.3.auth_id}</P505>
+        <P506 para="Account3.AuthenticatePassword">{$account.3.password}</P506>
+        <P507 para="Account3.DispalyName">{$account.3.display_name}</P507>
         <P508 para="Account3.DnsMode">{$sangoma_dns_mode}</P508>
         <P509 para="Account3.UserIdIsPhoneNumber">0</P509>
         <P510 para="Account3.SipRegistration">1</P510>
@@ -390,19 +390,19 @@
         <P20978 para="Account3.SCABargeIn">0</P20978>
         <!--Account4/Basic-->
         <P601 para="Account4.Active">1</P601>
-        <P602 para="Account4.Sipserver">{$server_address_4}</P602>
+        <P602 para="Account4.Sipserver">{$account.4.server_address}</P602>
         <P989 para="Account4.FailoverSipserver" />
         <P8854 para="Account4.SecondFailoverSipserver" />
         <P4570 para="Account4.PreferPrimaryServer">0</P4570>
-        <P603 para="Account4.OutboundProxy">{$outbound_proxy_primary_4}</P603>
-        <P20050 para="Account4.BackUpOutboundProxy">{$outbound_proxy_secondary_4}</P20050>
+        <P603 para="Account4.OutboundProxy">{$account.4.outbound_proxy_primary}</P603>
+        <P20050 para="Account4.BackUpOutboundProxy">{$account.4.outbound_proxy_secondary}</P20050>
         <P1030 para="Account4.SipTransport">{$sangoma_transport}</P1030>
         <P614 para="Account4.NatTraversal">2</P614>
-        <P20003 para="Account4.Lable">{$display_name_4}</P20003>
-        <P604 para="Account4.SipUserId">{$user_id_4}</P604>
-        <P605 para="Account4.AuthenticateID">{$auth_id_4}</P605>
-        <P606 para="Account4.AuthenticatePassword">{$user_password_4}</P606>
-        <P607 para="Account4.DispalyName">{$display_name_4}</P607>
+        <P20003 para="Account4.Lable">{$account.4.display_name}</P20003>
+        <P604 para="Account4.SipUserId">{$uaccount.4.ser_id}</P604>
+        <P605 para="Account4.AuthenticateID">{$account.4.auth_id}</P605>
+        <P606 para="Account4.AuthenticatePassword">{$account.4.password}</P606>
+        <P607 para="Account4.DispalyName">{$account.4.display_name}</P607>
         <P608 para="Account4.DnsMode">{$sangoma_dns_mode}</P608>
         <P609 para="Account4.UserIdIsPhoneNumber">0</P609>
         <P610 para="Account4.SipRegistration">1</P610>
@@ -519,19 +519,19 @@
         <P20979 para="Account4.SCABargeIn">0</P20979>
         <!--Account5/Basic-->
         <P20360 para="Account5.Active">1</P20360>
-        <P20362 para="Account5.Sipserver">{$server_address_5}</P20362>
+        <P20362 para="Account5.Sipserver">{$server_address}</P20362>
         <P20364 para="Account5.FailoverSipserver" />
         <P20366 para="Account5.SecondFailoverSipserver" />
         <P20368 para="Account5.PreferPrimaryServer">0</P20368>
-        <P20370 para="Account5.OutboundProxy">{$outbound_proxy_primary_5}</P20370>
-        <P20372 para="Account5.BackUpOutboundProxy">{$outbound_proxy_secondary_5}</P20372>
+        <P20370 para="Account5.OutboundProxy">{$account.5.outbound_proxy_primary}</P20370>
+        <P20372 para="Account5.BackUpOutboundProxy">{$account.5.outbound_proxy_secondary}</P20372>
         <P20374 para="Account5.SipTransport">{$sangoma_transport}</P20374>
         <P20376 para="Account5.NatTraversal">2</P20376>
-        <P20378 para="Account5.Lable">{$display_name_5}</P20378>
-        <P1704 para="Account5.SipUserId">{$user_id_5}</P1704>
-        <P1705 para="Account5.AuthenticateID">{$auth_id_5}</P1705>
-        <P1706 para="Account5.AuthenticatePassword">{$user_password_5}</P1706>
-        <P1707 para="Account5.DispalyName">{$display_name_5}</P1707>
+        <P20378 para="Account5.Lable">{$account.5.display_name}</P20378>
+        <P1704 para="Account5.SipUserId">{$account.5.user_id}</P1704>
+        <P1705 para="Account5.AuthenticateID">{$account.5.auth_id}</P1705>
+        <P1706 para="Account5.AuthenticatePassword">{$account.5.password}</P1706>
+        <P1707 para="Account5.DispalyName">{$account.5.display_name}</P1707>
         <P20380 para="Account5.DnsMode">{$sangoma_dns_mode}</P20380>
         <P20382 para="Account5.UserIdIsPhoneNumber">0</P20382>
         <P20384 para="Account5.SipRegistration">1</P20384>
@@ -648,19 +648,19 @@
         <P20980 para="Account5.SCABargeIn">0</P20980>
         <!--Account6/Basic-->
         <P20361 para="Account6.Active">1</P20361>
-        <P20363 para="Account6.Sipserver">{$server_address_6}</P20363>
+        <P20363 para="Account6.Sipserver">{$account.6.server_address}</P20363>
         <P20365 para="Account6.FailoverSipserver" />
         <P20367 para="Account6.SecondFailoverSipserver" />
         <P20369 para="Account6.PreferPrimaryServer">0</P20369>
-        <P20371 para="Account6.OutboundProxy">{$outbound_proxy_primary_6}</P20371>
-        <P20373 para="Account6.BackUpOutboundProxy">{$outbound_proxy_secondary_6}</P20373>
+        <P20371 para="Account6.OutboundProxy">{$account.6.outbound_proxy_primary}</P20371>
+        <P20373 para="Account6.BackUpOutboundProxy">{$account.6.outbound_proxy_secondary}</P20373>
         <P20375 para="Account6.SipTransport">{$sangoma_transport}</P20375>
         <P20377 para="Account6.NatTraversal">2</P20377>
-        <P20379 para="Account6.Lable">{$display_name_6}</P20379>
-        <P1804 para="Account6.SipUserId">{$user_id_6}</P1804>
-        <P1805 para="Account6.AuthenticateID">{$auth_id_6}</P1805>
-        <P1806 para="Account6.AuthenticatePassword">{$user_password_6}</P1806>
-        <P1807 para="Account6.DispalyName">{$display_name_6}</P1807>
+        <P20379 para="Account6.Lable">{$account.6.display_name}</P20379>
+        <P1804 para="Account6.SipUserId">{$account.6.user_id}</P1804>
+        <P1805 para="Account6.AuthenticateID">{$account.6.auth_id}</P1805>
+        <P1806 para="Account6.AuthenticatePassword">{$account.6.password}</P1806>
+        <P1807 para="Account6.DispalyName">{$account.6.display_name}</P1807>
         <P20381 para="Account6.DnsMode">{$sangoma_dns_mode}</P20381>
         <P20383 para="Account6.UserIdIsPhoneNumber">0</P20383>
         <P20385 para="Account6.SipRegistration">1</P20385>