diff --git a/resources/templates/provision/fanvil/x3g/{$mac}.cfg b/resources/templates/provision/fanvil/x3g/{$mac}.cfg
index 3282d67940..7e37711cc0 100644
--- a/resources/templates/provision/fanvil/x3g/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3g/{$mac}.cfg
@@ -265,23 +265,23 @@
 <SIP_Line_List>
 <SIP_Line_List_Entry>
 <ID>SIP1</ID>
-<Phone_Number>{$user_id_1}</Phone_Number>
-<Display_Name>{$display_name_1}</Display_Name>
+<Phone_Number>{$line.1.user_id}</Phone_Number>
+<Display_Name>{$line.1.display_name}</Display_Name>
 <Sip_Name>{$fanvil_server_name}</Sip_Name>
-<Register_Addr>{$server_address_1}</Register_Addr>
-<Register_Port>{$sip_port_1}</Register_Port>
-<Register_User>{$auth_id_1}</Register_User>
-<Register_Pswd>{$user_password_1}</Register_Pswd>
-<Register_TTL>{$register_expires_1}</Register_TTL>
+<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.user_password}</Register_Pswd>
+<Register_TTL>{$line.1.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($user_password_1)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($line.1.user_password)}1{else}0{/if}</Enable_Reg>
 
-<Proxy_Addr>{$outbound_proxy_primary_1}</Proxy_Addr>
-<Proxy_Port>{$sip_port_1}</Proxy_Port>
-<Proxy_User>{$auth_id_1}</Proxy_User>
-<Proxy_Pswd>{$user_password_1}</Proxy_Pswd>
-<BakProxy_Addr>{$outbound_proxy_secondary_1}</BakProxy_Addr>
-<BakProxy_Port>{$sip_port_1}</BakProxy_Port>
+<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.user_password}</Proxy_Pswd>
+<BakProxy_Addr>{$line.1.outbound_proxy_secondary}</BakProxy_Addr>
+<BakProxy_Port>{$line.1.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
 <Signal_Crypto>0</Signal_Crypto>
 <SigCrypto_Key></SigCrypto_Key>
@@ -331,11 +331,11 @@
 <RFC_Ver>1</RFC_Ver>
 <Signal_Port>5060</Signal_Port>
 
-{if $sip_transport_1 == 'udp'}<Transport>0</Transport>{/if}
-{if $sip_transport_1 == 'tcp'}<Transport>1</Transport>{/if}
-{if $sip_transport_1 == 'tls'}<Transport>2</Transport>{/if}
-{if $sip_transport_1 == 'dns srv'}<DNS_SRV>1</DNS_SRV>{/if}
-{if $sip_transport_1 == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/if}
+{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}
 
 <Enable_ChgPort>1</Enable_ChgPort>
 <TLS_Version>0</TLS_Version>
@@ -400,23 +400,23 @@
 </SIP_Line_List_Entry>
 <SIP_Line_List_Entry>
 <ID>SIP2</ID>
-<Phone_Number>{$user_id_2}</Phone_Number>
-<Display_Name>{$display_name_2}</Display_Name>
+<Phone_Number>{$line.2.user_id}</Phone_Number>
+<Display_Name>{$line.2.display_name}</Display_Name>
 <Sip_Name>{$fanvil_server_name}</Sip_Name>
-<Register_Addr>{$server_address_2}</Register_Addr>
-<Register_Port>{$sip_port_2}</Register_Port>
-<Register_User>{$auth_id_2}</Register_User>
-<Register_Pswd>{$user_password_2}</Register_Pswd>
-<Register_TTL>{$register_expires_2}</Register_TTL>
+<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.user_password}</Register_Pswd>
+<Register_TTL>{$line.2.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($user_password_2)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($line.2.user_password)}1{else}0{/if}</Enable_Reg>
 
-<Proxy_Addr>{$outbound_proxy_primary_2}</Proxy_Addr>
-<Proxy_Port>{$sip_port_2}</Proxy_Port>
-<Proxy_User>{$auth_id_2}</Proxy_User>
-<Proxy_Pswd>{$user_password_2}</Proxy_Pswd>
-<BakProxy_Addr>{$outbound_proxy_secondary_2}</BakProxy_Addr>
-<BakProxy_Port>{$sip_port_2}</BakProxy_Port>
+<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.user_password}</Proxy_Pswd>
+<BakProxy_Addr>{$line.2.outbound_proxy_secondary}</BakProxy_Addr>
+<BakProxy_Port>{$line.2.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
 <Signal_Crypto>0</Signal_Crypto>
 <SigCrypto_Key></SigCrypto_Key>
@@ -466,11 +466,11 @@
 <RFC_Ver>1</RFC_Ver>
 <Signal_Port>5060</Signal_Port>
 
-{if $sip_transport_2 == 'udp'}<Transport>0</Transport>{/if}
-{if $sip_transport_2 == 'tcp'}<Transport>1</Transport>{/if}
-{if $sip_transport_2 == 'tls'}<Transport>2</Transport>{/if}
-{if $sip_transport_2 == 'dns srv'}<DNS_SRV>1</DNS_SRV>{/if}
-{if $sip_transport_2 == 'dns srv'}<DNS_Mode>1</DNS_Mode>{/if}
+{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}
 
 <Enable_ChgPort>1</Enable_ChgPort>
 <TLS_Version>0</TLS_Version>