diff --git a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
index 72daacdf3b..c1b773fdb8 100644
--- a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -98,17 +99,21 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -165,7 +170,7 @@
             <SignalPort>5060</SignalPort>
             {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 == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -206,6 +211,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -245,6 +251,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -255,17 +262,21 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -322,7 +333,7 @@
             <SignalPort>5060</SignalPort>
             {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 == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -363,6 +374,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -402,6 +414,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -412,17 +425,21 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -479,7 +496,7 @@
             <SignalPort>5060</SignalPort>
             {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 == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -520,6 +537,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -559,6 +577,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -569,17 +588,21 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -636,7 +659,7 @@
             <SignalPort>5060</SignalPort>
             {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 == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -677,6 +700,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -716,6 +740,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
@@ -724,6 +749,7 @@
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
             <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
             <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -799,6 +825,8 @@
             <CallNumberFilter></CallNumberFilter>
             <AutoResumeCurrent>0</AutoResumeCurrent>
             <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -879,7 +907,7 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
@@ -1252,6 +1280,7 @@
     <cti>
         <EnabledActiveUri>1</EnabledActiveUri>
         <EnabledActionUrl>1</EnabledActionUrl>
+        <ActionUrlType>0</ActionUrlType>
         <ActiveUriIP></ActiveUriIP>
         <StartRebootUrl></StartRebootUrl>
         <BootCompletedUrl></BootCompletedUrl>
@@ -1262,6 +1291,8 @@
         <PhoneStateIdleUrl></PhoneStateIdleUrl>
         <PhoneStateTalking></PhoneStateTalking>
         <PhoneStateRinging></PhoneStateRinging>
+        <OnhookUri></OnhookUri>
+        <OffhookUrl></OffhookUrl>
         <DNDOnUrl></DNDOnUrl>
         <DNDOffUrl></DNDOffUrl>
         <AlwaysFWDOnUrl></AlwaysFWDOnUrl>
@@ -1531,6 +1562,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>