diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index 9b8d5f08ed..bc92f0fe98 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -130,8 +130,7 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -141,11 +140,12 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
                                  
-            #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+            
             {if $sip_transport_1 == 'udp'}<Transport>0</Transport>{/if}
             {if $sip_transport_1 == 'tcp'}<Transport>1</Transport>{/if}
             {if $sip_transport_1 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_1 == 'dns srv'}<Transport>3</Transport>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -270,8 +270,7 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -281,11 +280,12 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
                                  
-            #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+            
             {if $sip_transport_2 == 'udp'}<Transport>0</Transport>{/if}
             {if $sip_transport_2 == 'tcp'}<Transport>1</Transport>{/if}
             {if $sip_transport_2 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_2 == 'dns srv'}<Transport>3</Transport>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -410,8 +410,7 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -421,11 +420,12 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
                                  
-            #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+            
             {if $sip_transport_3 == 'udp'}<Transport>0</Transport>{/if}
             {if $sip_transport_3 == 'tcp'}<Transport>1</Transport>{/if}
             {if $sip_transport_3 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_3 == 'dns srv'}<Transport>3</Transport>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -550,8 +550,7 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -561,11 +560,12 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
                                  
-            #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+          
             {if $sip_transport_4 == 'udp'}<Transport>0</Transport>{/if}
             {if $sip_transport_4 == 'tcp'}<Transport>1</Transport>{/if}
             {if $sip_transport_4 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_4 == 'dns srv'}<Transport>3</Transport>{/if}
+            {if $sip_transport_4 == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $sip_transport_4 == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -690,8 +690,7 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -701,11 +700,12 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
                                  
-            #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+            
             {if $sip_transport_5 == 'udp'}<Transport>0</Transport>{/if}
             {if $sip_transport_5 == 'tcp'}<Transport>1</Transport>{/if}
             {if $sip_transport_5 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_5 == 'dns srv'}<Transport>3</Transport>{/if}
+            {if $sip_transport_5 == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $sip_transport_5 == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -830,8 +830,7 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -841,11 +840,12 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
                                  
-            #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+            
             {if $sip_transport_6 == 'udp'}<Transport>0</Transport>{/if}
             {if $sip_transport_6 == 'tcp'}<Transport>1</Transport>{/if}
             {if $sip_transport_6 == 'tls'}<Transport>2</Transport>{/if}
-            {if $sip_transport_6 == 'dns srv'}<Transport>3</Transport>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $sip_transport_1 == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>