diff --git a/resources/templates/provision/fanvil/x4/{$mac}.cfg b/resources/templates/provision/fanvil/x4/{$mac}.cfg
index 447d8a70d4..c1ba356bfc 100644
--- a/resources/templates/provision/fanvil/x4/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4/{$mac}.cfg
@@ -3,11 +3,11 @@
2.0002
DHCP
-
+
255.255.255.0
-
-
+{$dns_server_primary}
+{$dns_server_secondary}
1
0
Fanvil X4
@@ -15,15 +15,15 @@
0
1
0
-10000
-200
-time.nist.gov
-pool.ntp.org
+16384
+16384
+{$ntp_server_primary}
+{$ntp_server_secondary}
1
--20
-0
-UTC-5
-1
+{$fanvil_time_zone}
+{$fanvil_location}
+{$fanvil_time_zone_name}
+{$fanvil_enable_dst}
2
60
60
@@ -260,7 +260,7 @@
0
1
1
-0
+1
0
1
1
@@ -269,7 +269,7 @@
SIP1
{$user_id_1}
-{$display_name_1}
+{$display_name_1}
{$fanvil_server_name}
{$server_address_1}
{$sip_port_1}
@@ -338,6 +338,141 @@
0
1
5060
+1
+
+1
+0
+0
+
+0
+0
+1
+0
+
+
+
+
+1
+0
+5
+1
+0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+G722,G711U,G711A,G729,G726-32,G723
+
+
+0
+0
+4
+0
+1
+0
+1
+0
+0
+0
+0
+0
+
+0
+1
+0
+
+
+5060
+
+0
+0
+0
+
+
+1
+
+
+SIP2
+{$user_id_2}
+{$display_name_2}
+{$fanvil_server_name}
+{$server_address_2}
+{$sip_port_2}
+{$auth_id_2}
+{$user_password_2}
+{$register_expires_2}
+
+{if isset($user_password_2) }
+1
+{else}
+0
+{/if}
+
+{$outbound_proxy_primary_2}
+{$sip_port_2}
+{$auth_id_2}
+{$user_password_2}
+{$outbound_proxy_secondary_2}
+{$sip_port_2}
+1
+0
+
+0
+
+0
+
+0
+0
+0
+
+
+
+5
+0
+
+0
+0
+
+
+2
+30
+0
+
+1
+0
+0
+0
+0
+3
+0
+0
+1
+0
+3600
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+5060
0
1
0
@@ -401,151 +536,29 @@
1
-SIP2
-
-
-
-
-5060
-
-
-3600
-0
-
-5060
-
-
-
-5060
-0
-0
-
-0
-
-0
-
-0
-0
-0
-
-
-
-5
-0
-
-0
-0
-
-
-2
-30
-0
-
-1
-0
-0
-0
-0
-3
-0
-0
-1
-0
-3600
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-5060
-0
-1
-0
-0
-
-0
-0
-1
-0
-
-
-
-
-1
-0
-5
-1
-0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-G722,G711U,G711A,G729,G726-32,G723
-
-
-0
-0
-4
-0
-1
-0
-1
-0
-0
-0
-0
-0
-
-0
-1
-0
-
-
-5060
-
-0
-0
-0
-
-
-1
-
-
SIP3
-
-
-
-
-5060
-
-
-3600
-0
-
-5060
-
-
-
-5060
-0
+{$user_id_3}
+{$display_name_3}
+{$fanvil_server_name}
+{$server_address_3}
+{$sip_port_3}
+{$auth_id_3}
+{$user_password_3}
+{$register_expires_3}
+
+{if isset($user_password_3) }
+1
+{else}
+0
+{/if}
+
+{$outbound_proxy_primary_3}
+{$sip_port_3}
+{$auth_id_3}
+{$user_password_3}
+{$outbound_proxy_secondary_3}
+{$sip_port_3}
+1
0
0
@@ -658,22 +671,28 @@
SIP4
-
-
-
-
-5060
-
-
-3600
-0
-
-5060
-
-
-
-5060
-0
+{$user_id_4}
+{$display_name_4}
+{$fanvil_server_name}
+{$server_address_4}
+{$sip_port_4}
+{$auth_id_4}
+{$user_password_4}
+{$register_expires_4}
+
+{if isset($user_password_4) }
+1
+{else}
+0
+{/if}
+
+{$outbound_proxy_primary_4}
+{$sip_port_4}
+{$auth_id_4}
+{$user_password_4}
+{$outbound_proxy_secondary_4}
+{$sip_port_4}
+1
0
0
@@ -934,7 +953,13 @@
0
0
0
+
+{if isset({$fanvil_time_display}) }
1
+{else}
+0
+{/if}
+
X4
2
0
@@ -942,11 +967,11 @@
0
0
1
-4
+{$fanvil_date_display}
0
1
0
-1
+0
1
@@ -1180,7 +1205,7 @@
Fkey1
2
SIP1
-Line1 301
+{$display_name_1}
Fkey2
@@ -1594,8 +1619,8 @@
0
-admin
-admin
+{$http_auth_username}
+{$http_auth_password}
0
1
@@ -1613,11 +1638,11 @@
5060
0
1
-1
+0
1
1
5
-720
+5
0
0
0
@@ -1632,7 +1657,7 @@
1
0
-0.0.0.0
+
80
VPN
12345
@@ -1646,7 +1671,7 @@
1
-0.0.0.0
+
admin
admin
dps