diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index f839822097..499a46e9fe 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -2,9 +2,9 @@
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
-        <WANIP>192.168.1.179</WANIP>
+        <WANIP></WANIP>
         <WANSubnetMask>255.255.255.0</WANSubnetMask>
-        <WANGateway>192.168.1.1</WANGateway>
+        <WANGateway></WANGateway>
         <DomainName></DomainName>
         <PrimaryDNS>{$dns_server_primary}</PrimaryDNS>
         <SecondaryDNS>{$dns_server_secondary}</SecondaryDNS>
@@ -17,7 +17,7 @@
         <PPPoEUser>user123</PPPoEUser>
         <PPPoEPassword>password</PPPoEPassword>
         <wifi>
-            <WIFIEnable>0</WIFIEnable>
+            <WIFIEnable>{if isset($fanvil_wifi_enable)}0{else}1{/if}</WIFIEnable>
         </wifi>
     </net>
     <mm>
@@ -65,8 +65,8 @@
     </mm>
     <sip>
         <SIPPort>{$sip_port}</SIPPort>
-        <STUNServer></STUNServer>
-        <STUNPort>3478</STUNPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{if isset($fanvil_stun_port)}1{else}3478{/if}</STUNPort>
         <STUNRefreshTime>50</STUNRefreshTime>
         <SIPWaitStunTime>800</SIPWaitStunTime>
         <ExternNATAddrs></ExternNATAddrs>
@@ -92,12 +92,12 @@
             <EnableReg>{if isset($user_password_1)}1{else}0{/if}</EnableReg>
 
             <ProxyAddr>{$outbound_proxy_primary_1}</ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyPort>{$sip_port_1}</ProxyPort>
+            <ProxyUser>{$auth_id_1}</ProxyUser>
+            <ProxyPswd>{$user_password_1}</ProxyPswd>
+            <BakProxyAddr>{$outbound_proxy_secondary_1}</BakProxyAddr>
+            <BakProxyPort>{$sip_port_1}</BakProxyPort>
+            <EnableFailback>{if isset($outbound_proxy_secondary_1)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -234,12 +234,12 @@
             <EnableReg>{if isset($user_password_2)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr>{$outbound_proxy_primary_2}</ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyPort>{$sip_port_2}</ProxyPort>
+            <ProxyUser>{$auth_id_2}</ProxyUser>
+            <ProxyPswd>{$user_password_2}</ProxyPswd>
+            <BakProxyAddr>{$outbound_proxy_secondary_2}</BakProxyAddr>
+            <BakProxyPort>{$sip_port_1}</BakProxyPort>
+            <EnableFailback>{if isset($outbound_proxy_secondary_2)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -292,10 +292,10 @@
             <SignalPort>5060</SignalPort>
                                  
             #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-            {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'}<Transport>3</Transport>{/if}
+            <Transport>{if $sip_transport_2 == 'udp'}0{/if}</Transport>
+            <Transport>{if $sip_transport_2 == 'tcp'}1{/if}</Transport>
+            <Transport>{if $sip_transport_2 == 'tls'}2{/if}</Transport>
+            <Transport>{if $sip_transport_2 == 'dns srv'}3{/if}</Transport>
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -376,12 +376,12 @@
             <EnableReg>{if isset($user_password_3)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr>{$outbound_proxy_primary_3}</ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyPort>{$sip_port_3}</ProxyPort>
+            <ProxyUser>{$auth_id_3}</ProxyUser>
+            <ProxyPswd>{$user_password_3}</ProxyPswd>
+            <BakProxyAddr>{$outbound_proxy_secondary_3}</BakProxyAddr>
+            <BakProxyPort>{$sip_port_3}</BakProxyPort>
+            <EnableFailback>{if isset($outbound_proxy_secondary_3)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -434,10 +434,10 @@
             <SignalPort>5060</SignalPort>
                                  
             #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-            {if $sip_transport_3 == 'udp'}<Transport>0</Transport>{/if}
-            {if $sip_transport_3 == 'tcp'}<Transport>1</Transport>{/if}
-            {if $sip_transport_3 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_3 == 'dns srv'}<Transport>3</Transport>{/if}
+            <Transport>{if $sip_transport_3 == 'udp'}0{/if}</Transport>
+            <Transport>{if $sip_transport_3 == 'tcp'}1{/if}</Transport>
+            <Transport>{if $sip_transport_3 == 'tls'}2{/if}</Transport>
+            <Transport>{if $sip_transport_3 == 'dns srv'}3{/if}</Transport>
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -518,12 +518,12 @@
             <EnableReg>{if isset($user_password_4)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr>{$outbound_proxy_primary_4}</ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyPort>{$sip_port_4}</ProxyPort>
+            <ProxyUser>{$auth_id_4}</ProxyUser>
+            <ProxyPswd>{$user_password_4}</ProxyPswd>
+            <BakProxyAddr>{$outbound_proxy_secondary_4}</BakProxyAddr>
+            <BakProxyPort>{$sip_port_4}</BakProxyPort>
+            <EnableFailback>{if isset($outbound_proxy_secondary_4)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -576,10 +576,10 @@
             <SignalPort>5060</SignalPort>
                                  
             #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-            {if $sip_transport_4 == 'udp'}<Transport>0</Transport>{/if}
-            {if $sip_transport_4 == 'tcp'}<Transport>1</Transport>{/if}
-            {if $sip_transport_4 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_4 == 'dns srv'}<Transport>3</Transport>{/if}
+            <Transport>{if $sip_transport_4 == 'udp'}0{/if}</Transport>
+            <Transport>{if $sip_transport_4 == 'tcp'}1{/if}</Transport>
+            <Transport>{if $sip_transport_4 == 'tls'}2{/if}</Transport>
+            <Transport>{if $sip_transport_4 == 'dns srv'}3{/if}</Transport>
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -660,12 +660,12 @@
             <EnableReg>{if isset($user_password_5)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr>{$outbound_proxy_primary_5}</ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyPort>{$sip_port_5}</ProxyPort>
+            <ProxyUser>{$auth_id_5}</ProxyUser>
+            <ProxyPswd>{$user_password_5}</ProxyPswd>
+            <BakProxyAddr>{$outbound_proxy_secondary_5}</BakProxyAddr>
+            <BakProxyPort>{$sip_port_5}</BakProxyPort>
+            <EnableFailback>{if isset($outbound_proxy_secondary_5)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -718,10 +718,10 @@
             <SignalPort>5060</SignalPort>
                                  
             #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-            {if $sip_transport_5 == 'udp'}<Transport>0</Transport>{/if}
-            {if $sip_transport_5 == 'tcp'}<Transport>1</Transport>{/if}
-            {if $sip_transport_5 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_5 == 'dns srv'}<Transport>3</Transport>{/if}
+            <Transport>{if $sip_transport_5 == 'udp'}0{/if}</Transport>
+            <Transport>{if $sip_transport_5 == 'tcp'}1{/if}</Transport>
+            <Transport>{if $sip_transport_5 == 'tls'}2{/if}</Transport>
+            <Transport>{if $sip_transport_5 == 'dns srv'}3{/if}</Transport>
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -802,12 +802,12 @@
             <EnableReg>{if isset($user_password_6)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr>{$outbound_proxy_primary_6}</ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyPort>{$sip_port_6}</ProxyPort>
+            <ProxyUser>{$auth_id_6}</ProxyUser>
+            <ProxyPswd>{$user_password_6}</ProxyPswd>
+            <BakProxyAddr>{$outbound_proxy_secondary_6}</BakProxyAddr>
+            <BakProxyPort>{$sip_port_6}</BakProxyPort>
+            <EnableFailback>{if isset($outbound_proxy_secondary_6)}1{else}0{/if}</EnableFailback>
             <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
@@ -860,10 +860,10 @@
             <SignalPort>5060</SignalPort>
                                  
             #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-            {if $sip_transport_6 == 'udp'}<Transport>0</Transport>{/if}
-            {if $sip_transport_6 == 'tcp'}<Transport>1</Transport>{/if}
-            {if $sip_transport_6 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_6 == 'dns srv'}<Transport>3</Transport>{/if}
+            <Transport>{if $sip_transport_6 == 'udp'}0{/if}</Transport>
+            <Transport>{if $sip_transport_6 == 'tcp'}1{/if}</Transport>
+            <Transport>{if $sip_transport_6 == 'tls'}2{/if}</Transport>
+            <Transport>{if $sip_transport_6 == 'dns srv'}3{/if}</Transport>
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>