diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index 5d126552c1..2cf1d0260c 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -72,24 +72,24 @@
         <CSTAEnable>0</CSTAEnable>
         <NotifyReboot>1</NotifyReboot>
         <line index="1">
-            <PhoneNumber>{$line.1.user_id}</PhoneNumber>
-            <DisplayName>{$line.1.display_name}</DisplayName>
+            <PhoneNumber>{$account.1.user_id}</PhoneNumber>
+            <DisplayName>{$account.1.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr>{$line.1.server_address}</RegisterAddr>
-            <RegisterPort>{$line.1.sip_port}</RegisterPort>
-            <RegisterUser>{$line.1.auth_id}</RegisterUser>
-            <RegisterPswd>{$line.1.password}</RegisterPswd>
-            <RegisterTTL>{$line.1.register_expires}</RegisterTTL>
+            <RegisterAddr>{$account.1.server_address}</RegisterAddr>
+            <RegisterPort>{$account.1.sip_port}</RegisterPort>
+            <RegisterUser>{$account.1.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.1.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
             
-            <EnableReg>{if isset($line.1.password)}1{else}0{/if}</EnableReg>
+            <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr>{$line.1.outbound_proxy_primary}</ProxyAddr>
-            <ProxyPort>{$line.1.sip_port}</ProxyPort>
-            <ProxyUser>{$line.1.auth_id}</ProxyUser>
-            <ProxyPswd>{$line.1.password}</ProxyPswd>
-            <BakProxyAddr>{$line.1.outbound_proxy_secondary}</BakProxyAddr>
-            <BakProxyPort>{$line.1.sip_port}</BakProxyPort>
-            <EnableFailback>{if isset($line.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.1.sip_port}</ProxyPort>
+            <ProxyUser>{$account.1.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -141,11 +141,11 @@
             <SignalPort>5060</SignalPort>
                                  
             
-            {if $line.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
-            {if $line.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $line.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $line.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $line.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -211,24 +211,24 @@
             <UnregisterOnBoot>0</UnregisterOnBoot>            
         </line>
         <line index="2">
-            <PhoneNumber>{$line.2.user_id}</PhoneNumber>
-            <DisplayName>{$line.2.display_name}</DisplayName>
+            <PhoneNumber>{$account.2.user_id}</PhoneNumber>
+            <DisplayName>{$account.2.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr>{$line.2.server_address}</RegisterAddr>
-            <RegisterPort>{$line.2.sip_port}</RegisterPort>
-            <RegisterUser>{$line.2.auth_id}</RegisterUser>
-            <RegisterPswd>{$line.2.password}</RegisterPswd>
-            <RegisterTTL>{$line.2.register_expires}</RegisterTTL>
+            <RegisterAddr>{$account.2.server_address}</RegisterAddr>
+            <RegisterPort>{$account.2.sip_port}</RegisterPort>
+            <RegisterUser>{$account.2.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.2.password}</RegisterPswd>
+            <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
             
-            <EnableReg>{if isset($line.2.password)}1{else}0{/if}</EnableReg>
+            <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr>{$line.2.outbound_proxy_primary}</ProxyAddr>
-            <ProxyPort>{$line.2.sip_port}</ProxyPort>
-            <ProxyUser>{$line.2.auth_id}</ProxyUser>
-            <ProxyPswd>{$line.2.password}</ProxyPswd>
-            <BakProxyAddr>{$line.2.outbound_proxy_secondary}</BakProxyAddr>
-            <BakProxyPort>{$line.2.sip_port}</BakProxyPort>
-            <EnableFailback>{if isset($line.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.2.sip_port}</ProxyPort>
+            <ProxyUser>{$account.2.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -278,11 +278,11 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>                                 
             
-            {if $line.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
-            {if $line.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $line.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $line.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $line.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -348,23 +348,23 @@
             <UnregisterOnBoot>0</UnregisterOnBoot>            
         </line>
         <line index="3">
-            <PhoneNumber>{$line.3.user_id}</PhoneNumber>
-            <DisplayName>{$line.3.display_name}</DisplayName>
+            <PhoneNumber>{$account.3.user_id}</PhoneNumber>
+            <DisplayName>{$account.3.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr>{$line.3.server_address}</RegisterAddr>
-            <RegisterPort>{$line.3.sip_port}</RegisterPort>
-            <RegisterUser>{$line.3.auth_id}</RegisterUser>
-            <RegisterPswd>{$line.3.password}</RegisterPswd>
-            <RegisterTTL>{$line.3.register_expires}</RegisterTTL>
+            <RegisterAddr>{$account.3.server_address}</RegisterAddr>
+            <RegisterPort>{$account.3.sip_port}</RegisterPort>
+            <RegisterUser>{$account.3.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.3.password}</RegisterPswd>
+            <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
             
-            <EnableReg>{if isset($line.3.password)}1{else}0{/if}</EnableReg>
+            <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr>{$line.3.outbound_proxy_primary}</ProxyAddr>
-            <ProxyPort>{$line.3.sip_port}</ProxyPort>
-            <ProxyUser>{$line.3.auth_id}</ProxyUser>
-            <ProxyPswd>{$line.3.password}</ProxyPswd>
-            <BakProxyAddr>{$line.3.outbound_proxy_secondary}</BakProxyAddr>
-            <BakProxyPort>{$line.3.sip_port}</BakProxyPort>
+            <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.3.sip_port}</ProxyPort>
+            <ProxyUser>{$account.3.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
             <EnableFailback>{if isset($outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
@@ -415,11 +415,11 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>                                 
             
-            {if $line.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
-            {if $line.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $line.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $line.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $line.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -485,24 +485,24 @@
             <UnregisterOnBoot>0</UnregisterOnBoot>            
         </line>
         <line index="4">
-            <PhoneNumber>{$line.4.user_id}</PhoneNumber>
-            <DisplayName>{$line.4.display_name}</DisplayName>
+            <PhoneNumber>{$account.4.user_id}</PhoneNumber>
+            <DisplayName>{$account.4.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr>{$line.4.server_address}</RegisterAddr>
-            <RegisterPort>{$line.4.sip_port}</RegisterPort>
-            <RegisterUser>{$line.4.auth_id}</RegisterUser>
-            <RegisterPswd>{$line.4.password}</RegisterPswd>
-            <RegisterTTL>{$line.4.register_expires}</RegisterTTL>
+            <RegisterAddr>{$account.4.server_address}</RegisterAddr>
+            <RegisterPort>{$account.4.sip_port}</RegisterPort>
+            <RegisterUser>{$account.4.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.4.password}</RegisterPswd>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             
-            <EnableReg>{if isset($line.4.password)}1{else}0{/if}</EnableReg>
+            <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr>{$line.4.outbound_proxy_primary}</ProxyAddr>
-            <ProxyPort>{$line.4.sip_port}</ProxyPort>
-            <ProxyUser>{$line.4.auth_id}</ProxyUser>
-            <ProxyPswd>{$line.4.password}</ProxyPswd>
-            <BakProxyAddr>{$line.4.outbound_proxy_secondary}</BakProxyAddr>
-            <BakProxyPort>{$line.4.sip_port}</BakProxyPort>
-            <EnableFailback>{if isset($line.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.4.sip_port}</ProxyPort>
+            <ProxyUser>{$account.4.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -552,11 +552,11 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>                                 
           
-            {if $line.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
-            {if $line.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $line.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $line.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $line.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -622,24 +622,24 @@
             <UnregisterOnBoot>0</UnregisterOnBoot>            
         </line>
         <line index="5">
-            <PhoneNumber>{$line.5.user_id}</PhoneNumber>
-            <DisplayName>{$line.5.display_name}</DisplayName>
+            <PhoneNumber>{$account.5.user_id}</PhoneNumber>
+            <DisplayName>{$account.5.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr>{$line.5.server_address}</RegisterAddr>
-            <RegisterPort>{$line.5.sip_port}</RegisterPort>
-            <RegisterUser>{$line.5.auth_id}</RegisterUser>
-            <RegisterPswd>{$line.5.password}</RegisterPswd>
-            <RegisterTTL>{$line.5.register_expires}</RegisterTTL>
+            <RegisterAddr>{$account.5.server_address}</RegisterAddr>
+            <RegisterPort>{$account.5.sip_port}</RegisterPort>
+            <RegisterUser>{$account.5.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.5.password}</RegisterPswd>
+            <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
             
-            <EnableReg>{if isset($line.5.password)}1{else}0{/if}</EnableReg>
+            <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr>{$line.5.outbound_proxy_primary}</ProxyAddr>
-            <ProxyPort>{$line.5.sip_port}</ProxyPort>
-            <ProxyUser>{$line.5.auth_id}</ProxyUser>
-            <ProxyPswd>{$line.5.password}</ProxyPswd>
-            <BakProxyAddr>{$line.5.outbound_proxy_secondary}</BakProxyAddr>
-            <BakProxyPort>{$line.5.sip_port}</BakProxyPort>
-            <EnableFailback>{if isset($line.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.5.sip_port}</ProxyPort>
+            <ProxyUser>{$account.5.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -689,11 +689,11 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>                                 
             
-            {if $line.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
-            {if $line.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $line.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $line.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $line.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -759,24 +759,24 @@
             <UnregisterOnBoot>0</UnregisterOnBoot>            
         </line>
         <line index="6">
-            <PhoneNumber>{$line.6.user_id}</PhoneNumber>
-            <DisplayName>{$line.6.display_name}</DisplayName>
+            <PhoneNumber>{$account.6.user_id}</PhoneNumber>
+            <DisplayName>{$account.6.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr>{$line.6.server_address}</RegisterAddr>
-            <RegisterPort>{$line.6.sip_port}</RegisterPort>
-            <RegisterUser>{$line.6.auth_id}</RegisterUser>
-            <RegisterPswd>{$line.6.password}</RegisterPswd>
-            <RegisterTTL>{$line.6.register_expires}</RegisterTTL>
+            <RegisterAddr>{$account.6.server_address}</RegisterAddr>
+            <RegisterPort>{$account.6.sip_port}</RegisterPort>
+            <RegisterUser>{$account.6.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.6.password}</RegisterPswd>
+            <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
             
-            <EnableReg>{if isset($line.6.password)}1{else}0{/if}</EnableReg>
+            <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr>{$line.6.outbound_proxy_primary}</ProxyAddr>
-            <ProxyPort>{$line.6.sip_port}</ProxyPort>
-            <ProxyUser>{$line.6.auth_id}</ProxyUser>
-            <ProxyPswd>{$line.6.password}</ProxyPswd>
-            <BakProxyAddr>{$line.6.outbound_proxy_secondary}</BakProxyAddr>
-            <BakProxyPort>{$line.6.sip_port}</BakProxyPort>
-            <EnableFailback>{if isset($line.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.6.sip_port}</ProxyPort>
+            <ProxyUser>{$account.6.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -826,11 +826,11 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>                                 
             
-            {if $line.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
-            {if $line.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $line.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $line.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $line.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>