diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index 6d710a5eb0..355ae134dc 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -57,8 +57,8 @@
     </mm>
     <sip>
         <SIPPort>{$sip_port}</SIPPort>
-        <STUNServer></STUNServer>
-        <STUNPort>3478</STUNPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{$fanvil_stun_port}</STUNPort>
         <STUNRefreshTime>50</STUNRefreshTime>
         <SIPWaitStunTime>800</SIPWaitStunTime>
         <ExternNATAddrs></ExternNATAddrs>
@@ -83,13 +83,13 @@
             
             <EnableReg>{if isset($user_password_1)}1{else}0{/if}</EnableReg>
 
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyAddr>{$outbound_proxy_primary_1}</ProxyAddr>
+            <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>
@@ -223,13 +223,13 @@
             
             <EnableReg>{if isset($user_password_2)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyAddr>{$outbound_proxy_primary_2}</ProxyAddr>
+            <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>
@@ -363,13 +363,13 @@
             
             <EnableReg>{if isset($user_password_3)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyAddr>{$outbound_proxy_primary_3}</ProxyAddr>
+            <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>
@@ -503,13 +503,13 @@
             
             <EnableReg>{if isset($user_password_4)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyAddr>{$outbound_proxy_primary_4}</ProxyAddr>
+            <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>
@@ -643,13 +643,13 @@
             
             <EnableReg>{if isset($user_password_5)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyAddr>{$outbound_proxy_primary_5}</ProxyAddr>
+            <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>
@@ -783,13 +783,13 @@
             
             <EnableReg>{if isset($user_password_6)}1{else}0{/if}</EnableReg>
             
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>0</EnableFailback>
+            <ProxyAddr>{$outbound_proxy_primary_6}</ProxyAddr>
+            <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>