From f267fa1362cf0b467c38a353c4fd02b7efee0581 Mon Sep 17 00:00:00 2001
From: Mark J Crane <markjcrane@gmail.com>
Date: Tue, 19 May 2020 17:27:36 -0600
Subject: [PATCH] Add fanvil settings and correct some mistakes

---
 .../templates/provision/fanvil/x3u/{$mac}.cfg | 368 +++++++++---------
 .../templates/provision/fanvil/x4u/{$mac}.cfg | 368 +++++++++---------
 .../templates/provision/fanvil/x5s/{$mac}.cfg |   2 +-
 .../templates/provision/fanvil/x5u/{$mac}.cfg | 366 ++++++++---------
 .../templates/provision/fanvil/x6/{$mac}.cfg  |   2 +-
 .../templates/provision/fanvil/x6u/{$mac}.cfg | 366 ++++++++---------
 .../templates/provision/fanvil/x7/{$mac}.cfg  |   6 +-
 7 files changed, 763 insertions(+), 715 deletions(-)

diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index 701b396e55..e420591dd0 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -7,11 +7,11 @@
         <WANSubnetMask></WANSubnetMask>
         <WANGateway></WANGateway>
         <DomainName></DomainName>
-        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}</PrimaryDNS>
-        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}</SecondaryDNS>
+        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
+        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
-        <DHCPAutoTime>0</DHCPAutoTime>
+        <DHCPAutoTime>1</DHCPAutoTime>
         <DHCPOption100-101>1</DHCPOption100-101>
         <UseVendorClassID>0</UseVendorClassID>
         <VendorClassID>Fanvil X3U</VendorClassID>
@@ -74,9 +74,9 @@
         </capability>
     </mm>
     <sip>
-        <SIPPort>5060</SIPPort>
-        <STUNServer></STUNServer>
-        <STUNPort>3478</STUNPort>
+        <SIPPort>{$sip_port}</SIPPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{$fanvil_stun_port}</STUNPort>
         <STUNRefreshTime>50</STUNRefreshTime>
         <SIPWaitStunTime>800</SIPWaitStunTime>
         <ExternNATAddrs></ExternNATAddrs>
@@ -88,28 +88,28 @@
         <EnableRFC4475>1</EnableRFC4475>
         <StrictUAMatch>1</StrictUAMatch>
         <CSTAEnable>0</CSTAEnable>
-        <NotifyReboot>0</NotifyReboot>
+        <NotifyReboot>1</NotifyReboot>
         <line index="1">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.1.user_id}</PhoneNumber>
+            <DisplayName>{$account.1.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.1.server_address}</RegisterAddr>
+            <RegisterPort>{$account.1.sip_port}</RegisterPort>
+            <RegisterUser>{$account.1.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.1.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -133,7 +133,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -148,14 +148,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -164,15 +164,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -183,23 +185,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -245,26 +247,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="2">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.2.user_id}</PhoneNumber>
+            <DisplayName>{$account.2.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.2.server_address}</RegisterAddr>
+            <RegisterPort>{$account.2.sip_port}</RegisterPort>
+            <RegisterUser>{$account.2.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.2.password}</RegisterPswd>
+            <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -288,7 +290,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -303,14 +305,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -319,15 +321,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -338,23 +342,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -400,26 +404,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="3">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.3.user_id}</PhoneNumber>
+            <DisplayName>{$account.3.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.3.server_address}</RegisterAddr>
+            <RegisterPort>{$account.3.sip_port}</RegisterPort>
+            <RegisterUser>{$account.3.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.3.password}</RegisterPswd>
+            <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -443,7 +447,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -458,14 +462,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -474,15 +478,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -493,23 +499,25 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <SendANOnCode></SendANOnCode>
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -555,26 +563,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="4">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.4.user_id}</PhoneNumber>
+            <DisplayName>{$account.4.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.4.server_address}</RegisterAddr>
+            <RegisterPort>{$account.4.sip_port}</RegisterPort>
+            <RegisterUser>{$account.4.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.4.password}</RegisterPswd>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -598,7 +606,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -613,14 +621,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -629,15 +637,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -648,23 +658,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -710,26 +720,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="5">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.5.user_id}</PhoneNumber>
+            <DisplayName>{$account.5.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.5.server_address}</RegisterAddr>
+            <RegisterPort>{$account.5.sip_port}</RegisterPort>
+            <RegisterUser>{$account.5.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.5.password}</RegisterPswd>
+            <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.5.sip_port}</ProxyPort>
+            <ProxyUser>{$account.5.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -753,7 +763,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -768,7 +778,7 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
@@ -784,15 +794,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -803,23 +815,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
index cddb247dce..46d3443d92 100644
--- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
@@ -7,11 +7,11 @@
         <WANSubnetMask></WANSubnetMask>
         <WANGateway></WANGateway>
         <DomainName></DomainName>
-        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}</PrimaryDNS>
-        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}</SecondaryDNS>
+        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
+        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
-        <DHCPAutoTime>0</DHCPAutoTime>
+        <DHCPAutoTime>1</DHCPAutoTime>
         <DHCPOption100-101>1</DHCPOption100-101>
         <UseVendorClassID>0</UseVendorClassID>
         <VendorClassID>Fanvil X4U</VendorClassID>
@@ -80,9 +80,9 @@
         </capability>
     </mm>
     <sip>
-        <SIPPort>5060</SIPPort>
-        <STUNServer></STUNServer>
-        <STUNPort>3478</STUNPort>
+        <SIPPort>{$sip_port}</SIPPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{$fanvil_stun_port}</STUNPort>
         <STUNRefreshTime>50</STUNRefreshTime>
         <SIPWaitStunTime>800</SIPWaitStunTime>
         <ExternNATAddrs></ExternNATAddrs>
@@ -94,28 +94,28 @@
         <EnableRFC4475>1</EnableRFC4475>
         <StrictUAMatch>1</StrictUAMatch>
         <CSTAEnable>0</CSTAEnable>
-        <NotifyReboot>0</NotifyReboot>
+        <NotifyReboot>1</NotifyReboot>
         <line index="1">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.1.user_id}</PhoneNumber>
+            <DisplayName>{$account.1.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.1.server_address}</RegisterAddr>
+            <RegisterPort>{$account.1.sip_port}</RegisterPort>
+            <RegisterUser>{$account.1.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.1.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -139,7 +139,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -154,14 +154,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -170,15 +170,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -189,23 +191,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -251,26 +253,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="2">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.2.user_id}</PhoneNumber>
+            <DisplayName>{$account.2.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.2.server_address}</RegisterAddr>
+            <RegisterPort>{$account.2.sip_port}</RegisterPort>
+            <RegisterUser>{$account.2.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.2.password}</RegisterPswd>
+            <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -294,7 +296,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -309,14 +311,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -325,15 +327,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -344,23 +348,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -406,26 +410,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="3">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.3.user_id}</PhoneNumber>
+            <DisplayName>{$account.3.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.3.server_address}</RegisterAddr>
+            <RegisterPort>{$account.3.sip_port}</RegisterPort>
+            <RegisterUser>{$account.3.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.3.password}</RegisterPswd>
+            <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -449,7 +453,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -464,14 +468,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -480,15 +484,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -499,23 +505,25 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <SendANOnCode></SendANOnCode>
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -561,26 +569,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="4">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.4.user_id}</PhoneNumber>
+            <DisplayName>{$account.4.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.4.server_address}</RegisterAddr>
+            <RegisterPort>{$account.4.sip_port}</RegisterPort>
+            <RegisterUser>{$account.4.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.4.password}</RegisterPswd>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -604,7 +612,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -619,14 +627,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -635,15 +643,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -654,23 +664,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -716,26 +726,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="5">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.5.user_id}</PhoneNumber>
+            <DisplayName>{$account.5.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.5.server_address}</RegisterAddr>
+            <RegisterPort>{$account.5.sip_port}</RegisterPort>
+            <RegisterUser>{$account.5.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.5.password}</RegisterPswd>
+            <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.5.sip_port}</ProxyPort>
+            <ProxyUser>{$account.5.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -759,7 +769,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -774,7 +784,7 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
@@ -790,15 +800,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -809,23 +821,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2124,7 +2136,7 @@
             <LCDTitle>VOIP PHONE</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
             <EnableEnergysaving>4</EnableEnergysaving>
-            <LCDLuminanceLevel>15</LCDLuminanceLevel>
+            <LCDLuminanceLevel>12</LCDLuminanceLevel>
             <BacklightOffTime>45</BacklightOffTime>
             <DisableCHNIME>0</DisableCHNIME>
             <PhoneModel></PhoneModel>
diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index 9875636784..c01ac3ac6b 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -540,7 +540,7 @@
             <RegisterPort>{$account.4.sip_port}</RegisterPort>
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
-            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
index f514b677da..0ac0ea0752 100644
--- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
@@ -7,11 +7,11 @@
         <WANSubnetMask></WANSubnetMask>
         <WANGateway></WANGateway>
         <DomainName></DomainName>
-        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}</PrimaryDNS>
-        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}</SecondaryDNS>
+        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
+        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
-        <DHCPAutoTime>0</DHCPAutoTime>
+        <DHCPAutoTime>1</DHCPAutoTime>
         <DHCPOption100-101>1</DHCPOption100-101>
         <UseVendorClassID>0</UseVendorClassID>
         <VendorClassID>Fanvil X5U</VendorClassID>
@@ -80,9 +80,9 @@
         </capability>
     </mm>
     <sip>
-        <SIPPort>5060</SIPPort>
-        <STUNServer></STUNServer>
-        <STUNPort>3478</STUNPort>
+        <SIPPort>{$sip_port}</SIPPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{$fanvil_stun_port}</STUNPort>
         <STUNRefreshTime>50</STUNRefreshTime>
         <SIPWaitStunTime>800</SIPWaitStunTime>
         <ExternNATAddrs></ExternNATAddrs>
@@ -94,28 +94,28 @@
         <EnableRFC4475>1</EnableRFC4475>
         <StrictUAMatch>1</StrictUAMatch>
         <CSTAEnable>0</CSTAEnable>
-        <NotifyReboot>0</NotifyReboot>
+        <NotifyReboot>1</NotifyReboot>
         <line index="1">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.1.user_id}</PhoneNumber>
+            <DisplayName>{$account.1.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.1.server_address}</RegisterAddr>
+            <RegisterPort>{$account.1.sip_port}</RegisterPort>
+            <RegisterUser>{$account.1.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.1.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -139,7 +139,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -154,14 +154,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -170,15 +170,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -189,23 +191,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -251,26 +253,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="2">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.2.user_id}</PhoneNumber>
+            <DisplayName>{$account.2.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.2.server_address}</RegisterAddr>
+            <RegisterPort>{$account.2.sip_port}</RegisterPort>
+            <RegisterUser>{$account.2.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.2.password}</RegisterPswd>
+            <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -294,7 +296,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -309,14 +311,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -325,15 +327,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -344,23 +348,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -406,26 +410,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="3">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.3.user_id}</PhoneNumber>
+            <DisplayName>{$account.3.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.3.server_address}</RegisterAddr>
+            <RegisterPort>{$account.3.sip_port}</RegisterPort>
+            <RegisterUser>{$account.3.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.3.password}</RegisterPswd>
+            <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -449,7 +453,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -464,14 +468,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -480,15 +484,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -499,23 +505,25 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <SendANOnCode></SendANOnCode>
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -561,26 +569,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="4">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.4.user_id}</PhoneNumber>
+            <DisplayName>{$account.4.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.4.server_address}</RegisterAddr>
+            <RegisterPort>{$account.4.sip_port}</RegisterPort>
+            <RegisterUser>{$account.4.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.4.password}</RegisterPswd>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -604,7 +612,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -619,14 +627,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -635,15 +643,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -654,23 +664,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -716,26 +726,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="5">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.5.user_id}</PhoneNumber>
+            <DisplayName>{$account.5.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.5.server_address}</RegisterAddr>
+            <RegisterPort>{$account.5.sip_port}</RegisterPort>
+            <RegisterUser>{$account.5.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.5.password}</RegisterPswd>
+            <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.5.sip_port}</ProxyPort>
+            <ProxyUser>{$account.5.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -759,7 +769,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -774,7 +784,7 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
@@ -790,15 +800,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -809,23 +821,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 0e9ad7b868..f2d03f5cf3 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -537,7 +537,7 @@
             <RegisterPort>{$account.4.sip_port}</RegisterPort>
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
-            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
diff --git a/resources/templates/provision/fanvil/x6u/{$mac}.cfg b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
index fc2212e9cb..eef3394fc3 100644
--- a/resources/templates/provision/fanvil/x6u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
@@ -7,11 +7,11 @@
         <WANSubnetMask></WANSubnetMask>
         <WANGateway></WANGateway>
         <DomainName></DomainName>
-        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}</PrimaryDNS>
-        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}</SecondaryDNS>
+        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
+        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
-        <DHCPAutoTime>0</DHCPAutoTime>
+        <DHCPAutoTime>1</DHCPAutoTime>
         <DHCPOption100-101>1</DHCPOption100-101>
         <UseVendorClassID>0</UseVendorClassID>
         <VendorClassID>Fanvil X6U</VendorClassID>
@@ -85,9 +85,9 @@
         </capability>
     </mm>
     <sip>
-        <SIPPort>5060</SIPPort>
-        <STUNServer></STUNServer>
-        <STUNPort>3478</STUNPort>
+        <SIPPort>{$sip_port}</SIPPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{$fanvil_stun_port}</STUNPort>
         <STUNRefreshTime>50</STUNRefreshTime>
         <SIPWaitStunTime>800</SIPWaitStunTime>
         <ExternNATAddrs></ExternNATAddrs>
@@ -99,28 +99,28 @@
         <EnableRFC4475>1</EnableRFC4475>
         <StrictUAMatch>1</StrictUAMatch>
         <CSTAEnable>0</CSTAEnable>
-        <NotifyReboot>0</NotifyReboot>
+        <NotifyReboot>1</NotifyReboot>
         <line index="1">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.1.user_id}</PhoneNumber>
+            <DisplayName>{$account.1.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.1.server_address}</RegisterAddr>
+            <RegisterPort>{$account.1.sip_port}</RegisterPort>
+            <RegisterUser>{$account.1.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.1.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -144,7 +144,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -159,14 +159,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -175,15 +175,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -194,23 +196,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -256,26 +258,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="2">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.2.user_id}</PhoneNumber>
+            <DisplayName>{$account.2.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.2.server_address}</RegisterAddr>
+            <RegisterPort>{$account.2.sip_port}</RegisterPort>
+            <RegisterUser>{$account.2.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.2.password}</RegisterPswd>
+            <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -299,7 +301,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -314,14 +316,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -330,15 +332,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -349,23 +353,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -411,26 +415,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="3">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.3.user_id}</PhoneNumber>
+            <DisplayName>{$account.3.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.3.server_address}</RegisterAddr>
+            <RegisterPort>{$account.3.sip_port}</RegisterPort>
+            <RegisterUser>{$account.3.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.3.password}</RegisterPswd>
+            <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -454,7 +458,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -469,14 +473,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -485,15 +489,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -504,23 +510,25 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <SendANOnCode></SendANOnCode>
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -566,26 +574,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="4">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.4.user_id}</PhoneNumber>
+            <DisplayName>{$account.4.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.4.server_address}</RegisterAddr>
+            <RegisterPort>{$account.4.sip_port}</RegisterPort>
+            <RegisterUser>{$account.4.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.4.password}</RegisterPswd>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <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>
+            <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -609,7 +617,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -624,14 +632,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -640,15 +648,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {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}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -659,23 +669,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -721,26 +731,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="5">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.5.user_id}</PhoneNumber>
+            <DisplayName>{$account.5.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.5.server_address}</RegisterAddr>
+            <RegisterPort>{$account.5.sip_port}</RegisterPort>
+            <RegisterUser>{$account.5.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.5.password}</RegisterPswd>
+            <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.5.sip_port}</ProxyPort>
+            <ProxyUser>{$account.5.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -764,7 +774,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -779,7 +789,7 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
@@ -795,15 +805,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -814,23 +826,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
diff --git a/resources/templates/provision/fanvil/x7/{$mac}.cfg b/resources/templates/provision/fanvil/x7/{$mac}.cfg
index 151dab5bb9..a3b3f5f6ff 100644
--- a/resources/templates/provision/fanvil/x7/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x7/{$mac}.cfg
@@ -4,7 +4,7 @@
     <net>
         <WANTYPE>0</WANTYPE>
         <WANIP></WANIP>
-        <WANSubnetMask>255.255.255.0</WANSubnetMask>
+        <WANSubnetMask></WANSubnetMask>
         <WANGateway></WANGateway>
         <DomainName></DomainName>
         <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
@@ -568,7 +568,7 @@
             <RegisterPort>{$account.4.sip_port}</RegisterPort>
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
-            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
@@ -3647,7 +3647,7 @@
         <NoAnsFWDOffUrl></NoAnsFWDOffUrl>
         <MuteOnUrl></MuteOnUrl>
         <MuteOffUrl></MuteOffUrl>
-        <IncmoingCallUrl></IncmoingCallUrl>
+        <IncomingCallUrl></IncomingCallUrl>
         <OutgoingCallUrl></OutgoingCallUrl>
         <CallActiveUrl></CallActiveUrl>
         <CallStopUrl></CallStopUrl>