diff --git a/resources/templates/provision/fanvil/x4g/{$mac}.cfg b/resources/templates/provision/fanvil/x4g/{$mac}.cfg
index c6f1ee96f1..c41a644fe5 100644
--- a/resources/templates/provision/fanvil/x4g/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4g/{$mac}.cfg
@@ -268,23 +268,23 @@
 <SIP_Line_List>
 <SIP_Line_List_Entry>
 <ID>SIP1</ID>
-<Phone_Number>{$line.1.user_id}</Phone_Number>
-<DisplayName>{$line.1.display_name}</DisplayName>
+<Phone_Number>{$account.1.user_id}</Phone_Number>
+<DisplayName>{$account.1.display_name}</DisplayName>
 <Sip_Name>{$fanvil_server_name}</Sip_Name>
-<Register_Addr>{$line.1.server_address}</Register_Addr>
-<Register_Port>{$line.1.sip_port}</Register_Port>
-<Register_User>{$line.1.auth_id}</Register_User>
-<Register_Pswd>{$line.1.password}</Register_Pswd>
-<Register_TTL>{$line.1.register_expires}</Register_TTL>
+<Register_Addr>{$account.1.server_address}</Register_Addr>
+<Register_Port>{$account.1.sip_port}</Register_Port>
+<Register_User>{$account.1.auth_id}</Register_User>
+<Register_Pswd>{$account.1.password}</Register_Pswd>
+<Register_TTL>{$account.1.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.1.password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($account.1.password)}1{else}0{/if}</Enable_Reg>
 
-<Proxy_Addr>{$line.1.outbound_proxy_primary}</Proxy_Addr>
-<Proxy_Port>{$line.1.sip_port}</Proxy_Port>
-<Proxy_User>{$line.1.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.1.password}</Proxy_Pswd>
-<BakProxy_Addr>{$line.1.outbound_proxy_secondary}</BakProxy_Addr>
-<BakProxy_Port>{$line.1.sip_port}</BakProxy_Port>
+<Proxy_Addr>{$account.1.outbound_proxy_primary}</Proxy_Addr>
+<Proxy_Port>{$account.1.sip_port}</Proxy_Port>
+<Proxy_User>{$account.1.auth_id}</Proxy_User>
+<Proxy_Pswd>{$account.1.password}</Proxy_Pswd>
+<BakProxy_Addr>{$account.1.outbound_proxy_secondary}</BakProxy_Addr>
+<BakProxy_Port>{$account.1.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
 <Signal_Crypto>0</Signal_Crypto>
 <SigCrypto_Key></SigCrypto_Key>
@@ -334,11 +334,11 @@
 <RFC_Ver>1</RFC_Ver>
 <Signal_Port>5060</Signal_Port>
 
-{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'}<DNS_SRV>1</DNS_SRV>{/if}
-{if $line.1.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/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'}<DNS_SRV>1</DNS_SRV>{/if}
+{if $account.1.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/if}
 
 <Enable_ChgPort>1</Enable_ChgPort>
 <TLS_Version>0</TLS_Version>
@@ -403,23 +403,23 @@
 </SIP_Line_List_Entry>
 <SIP_Line_List_Entry>
 <ID>SIP2</ID>
-<Phone_Number>{$line.2.user_id}</Phone_Number>
-<DisplayName>{$line.2.display_name}</DisplayName>
+<Phone_Number>{$account.2.user_id}</Phone_Number>
+<DisplayName>{$account.2.display_name}</DisplayName>
 <Sip_Name>{$fanvil_server_name}</Sip_Name>
-<Register_Addr>{$line.2.server_address}</Register_Addr>
-<Register_Port>{$line.2.sip_port}</Register_Port>
-<Register_User>{$line.2.auth_id}</Register_User>
-<Register_Pswd>{$line.2.password}</Register_Pswd>
-<Register_TTL>{$line.2.register_expires}</Register_TTL>
+<Register_Addr>{$account.2.server_address}</Register_Addr>
+<Register_Port>{$account.2.sip_port}</Register_Port>
+<Register_User>{$account.2.auth_id}</Register_User>
+<Register_Pswd>{$account.2.password}</Register_Pswd>
+<Register_TTL>{$account.2.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.2.password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($account.2.password)}1{else}0{/if}</Enable_Reg>
 
-<Proxy_Addr>{$line.2.outbound_proxy_primary}</Proxy_Addr>
-<Proxy_Port>{$line.2.sip_port}</Proxy_Port>
-<Proxy_User>{$line.2.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.2.password}</Proxy_Pswd>
-<BakProxy_Addr>{$line.2.outbound_proxy_secondary}</BakProxy_Addr>
-<BakProxy_Port>{$line.2.sip_port}</BakProxy_Port>
+<Proxy_Addr>{$account.2.outbound_proxy_primary}</Proxy_Addr>
+<Proxy_Port>{$account.2.sip_port}</Proxy_Port>
+<Proxy_User>{$account.2.auth_id}</Proxy_User>
+<Proxy_Pswd>{$account.2.password}</Proxy_Pswd>
+<BakProxy_Addr>{$account.2.outbound_proxy_secondary}</BakProxy_Addr>
+<BakProxy_Port>{$account.2.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
 <Signal_Crypto>0</Signal_Crypto>
 <SigCrypto_Key></SigCrypto_Key>
@@ -469,11 +469,11 @@
 <RFC_Ver>1</RFC_Ver>
 <Signal_Port>5060</Signal_Port>
 
-{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'}<DNS_SRV>1</DNS_SRV>{/if}
-{if $line.2.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/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'}<DNS_SRV>1</DNS_SRV>{/if}
+{if $account.2.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/if}
 
 <Enable_ChgPort>1</Enable_ChgPort>
 <TLS_Version>0</TLS_Version>
@@ -538,23 +538,23 @@
 </SIP_Line_List_Entry>
 <SIP_Line_List_Entry>
 <ID>SIP3</ID>
-<Phone_Number>{$line.3.user_id}</Phone_Number>
-<DisplayName>{$line.3.display_name}</DisplayName>
+<Phone_Number>{$account.3.user_id}</Phone_Number>
+<DisplayName>{$account.3.display_name}</DisplayName>
 <Sip_Name>{$fanvil_server_name}</Sip_Name>
-<Register_Addr>{$line.3.server_address}</Register_Addr>
-<Register_Port>{$line.3.sip_port}</Register_Port>
-<Register_User>{$line.3.auth_id}</Register_User>
-<Register_Pswd>{$line.3.password}</Register_Pswd>
-<Register_TTL>{$line.3.register_expires}</Register_TTL>
+<Register_Addr>{$account.3.server_address}</Register_Addr>
+<Register_Port>{$account.3.sip_port}</Register_Port>
+<Register_User>{$account.3.auth_id}</Register_User>
+<Register_Pswd>{$account.3.password}</Register_Pswd>
+<Register_TTL>{$account.3.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.3.password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($account.3.password)}1{else}0{/if}</Enable_Reg>
 
-<Proxy_Addr>{$line.3.outbound_proxy_primary}</Proxy_Addr>
-<Proxy_Port>{$line.3.sip_port}</Proxy_Port>
-<Proxy_User>{$line.3.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.3.password}</Proxy_Pswd>
-<BakProxy_Addr>{$line.3.outbound_proxy_secondary}</BakProxy_Addr>
-<BakProxy_Port>{$line.3.sip_port}</BakProxy_Port>
+<Proxy_Addr>{$account.3.outbound_proxy_primary}</Proxy_Addr>
+<Proxy_Port>{$account.3.sip_port}</Proxy_Port>
+<Proxy_User>{$account.3.auth_id}</Proxy_User>
+<Proxy_Pswd>{$account.3.password}</Proxy_Pswd>
+<BakProxy_Addr>{$account.3.outbound_proxy_secondary}</BakProxy_Addr>
+<BakProxy_Port>{$account.3.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
 <Signal_Crypto>0</Signal_Crypto>
 <SigCrypto_Key></SigCrypto_Key>
@@ -604,11 +604,11 @@
 <RFC_Ver>1</RFC_Ver>
 <Signal_Port>5060</Signal_Port>
 
-{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'}<DNS_SRV>1</DNS_SRV>{/if}
-{if $line.3.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/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'}<DNS_SRV>1</DNS_SRV>{/if}
+{if $account.3.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/if}
 
 <Enable_ChgPort>1</Enable_ChgPort>
 <TLS_Version>0</TLS_Version>
@@ -673,23 +673,23 @@
 </SIP_Line_List_Entry>
 <SIP_Line_List_Entry>
 <ID>SIP4</ID>
-<Phone_Number>{$line.4.user_id}</Phone_Number>
-<DisplayName>{$line.4.display_name}</DisplayName>
+<Phone_Number>{$account.4.user_id}</Phone_Number>
+<DisplayName>{$account.4.display_name}</DisplayName>
 <Sip_Name>{$fanvil_server_name}</Sip_Name>
-<Register_Addr>{$line.4.server_address}</Register_Addr>
-<Register_Port>{$line.4.sip_port}</Register_Port>
-<Register_User>{$line.4.auth_id}</Register_User>
-<Register_Pswd>{$line.4.password}</Register_Pswd>
-<Register_TTL>{$line.4.register_expires}</Register_TTL>
+<Register_Addr>{$account.4.server_address}</Register_Addr>
+<Register_Port>{$account.4.sip_port}</Register_Port>
+<Register_User>{$account.4.auth_id}</Register_User>
+<Register_Pswd>{$account.4.password}</Register_Pswd>
+<Register_TTL>{$account.4.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.4.password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($account.4.password)}1{else}0{/if}</Enable_Reg>
 
-<Proxy_Addr>{$line.4.outbound_proxy_primary}</Proxy_Addr>
-<Proxy_Port>{$line.4.sip_port}</Proxy_Port>
-<Proxy_User>{$line.4.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.4.password}</Proxy_Pswd>
-<BakProxy_Addr>{$line.4.outbound_proxy_secondary}</BakProxy_Addr>
-<BakProxy_Port>{$line.4.sip_port}</BakProxy_Port>
+<Proxy_Addr>{$account.4.outbound_proxy_primary}</Proxy_Addr>
+<Proxy_Port>{$account.4.sip_port}</Proxy_Port>
+<Proxy_User>{$account.4.auth_id}</Proxy_User>
+<Proxy_Pswd>{$account.4.password}</Proxy_Pswd>
+<BakProxy_Addr>{$account.4.outbound_proxy_secondary}</BakProxy_Addr>
+<BakProxy_Port>{$account.4.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
 <Signal_Crypto>0</Signal_Crypto>
 <SigCrypto_Key></SigCrypto_Key>
@@ -739,11 +739,11 @@
 <RFC_Ver>1</RFC_Ver>
 <Signal_Port>5060</Signal_Port>
 
-{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'}<DNS_SRV>1</DNS_SRV>{/if}
-{if $line.4.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/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'}<DNS_SRV>1</DNS_SRV>{/if}
+{if $account.4.sip_transport == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/if}
 
 <Enable_ChgPort>1</Enable_ChgPort>
 <TLS_Version>0</TLS_Version>
@@ -1208,25 +1208,25 @@
 <ID>Fkey1</ID>
 <Type>2</Type>
 <Value>SIP1</Value>
-<Title>{$line.1.display_name}</Title>
+<Title>{$account.1.display_name}</Title>
 </Function_Key_Entry>
 <Function_Key_Entry>
 <ID>Fkey2</ID>
 <Type>2</Type>
 <Value>SIP2</Value>
-<Title>{$line.2.display_name}</Title>
+<Title>{$account.2.display_name}</Title>
 </Function_Key_Entry>
 <Function_Key_Entry>
 <ID>Fkey3</ID>
 <Type>2</Type>
 <Value>SIP3</Value>
-<Title>{$line.3.display_name}</Title>
+<Title>{$account.3.display_name}</Title>
 </Function_Key_Entry>
 <Function_Key_Entry>
 <ID>Fkey4</ID>
 <Type>2</Type>
 <Value>SIP4</Value>
-<Title>{$line.4.display_name}</Title>
+<Title>{$account.4.display_name}</Title>
 </Function_Key_Entry>
 <Function_Key_Entry>
 <ID>Fkey5</ID>