diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index 0a55bf9836..5ffe0529bc 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -27,12 +27,16 @@
 
 <!-- Primary SIP Server -->
 <!-- String: serveraddress  -->
+{if $account.1.sip_transport != 'dns srv'}
 <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+<P47>{$account.1.server_address}</P47>
+{/if}
 
 <!-- Failover SIP Server -->
 <!-- String: serveraddress  -->
 
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
 <P967>{$account.1.server_address_secondary}:{$account.1.sip_port}</P967>
 {else}
 <P967>{$account.1.server_address_secondary}</P967>
@@ -46,7 +50,7 @@
 <!-- Outbound Proxy -->
 <!-- String: serveraddress  -->
 
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
 <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
 <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -590,7 +594,7 @@
 <!-- Outbound Proxy -->
 <!-- String: serveraddress  -->
 
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
 <P748>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P748>
 {else}
 <P748>{$account.2.outbound_proxy_primary}</P748>
@@ -1119,7 +1123,7 @@
 <!-- Outbound Proxy -->
 <!-- String: serveraddress  -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
 <P548>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P548>
 {else}
 <P548>{$account.3.outbound_proxy_primary}</P548>
@@ -1649,7 +1653,7 @@
 <!-- Outbound Proxy -->
 <!-- String: serveraddress  -->
 
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
 <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
 <P603>{$account.4.outbound_proxy_primary}</P603>
diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
index 1b52e4558b..d43098b3db 100644
--- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
@@ -3773,7 +3773,6 @@
     <!-- # Number: 0, 1, 2, 3 -->
     {if isset($grandstream_ipv_mode)}<P1415>{$grandstream_ipv_mode}</P1415>{else}<P1415>0</P1415>{/if}
 
-
     <!-- # Address Type. 0 - DHCP, 1 - Static, 2 - PPPoE. Default value is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <P8>0</P8>
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index 2c39cd0953..dbfe571a93 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -985,12 +989,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -999,7 +1007,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1008,7 +1016,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index b2c271e71b..dadda5b812 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -985,12 +989,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -999,7 +1007,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1008,7 +1016,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 70ad5a1c88..4c59aa8fdb 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -985,12 +989,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -999,7 +1007,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1008,7 +1016,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1934,12 +1942,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1948,7 +1960,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1957,7 +1969,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 86977dc9f8..9b8bc65605 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -985,12 +989,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -999,7 +1007,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1008,7 +1016,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1934,12 +1942,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1948,7 +1960,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1957,7 +1969,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2882,12 +2894,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2896,7 +2912,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2905,7 +2921,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index 59da396f8f..7107dd29fd 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -1001,12 +1005,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -1015,7 +1023,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1024,7 +1032,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1966,12 +1974,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1980,7 +1992,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1989,7 +2001,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2930,12 +2942,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2944,7 +2960,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2953,7 +2969,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3897,12 +3913,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P702>{$account.5.server_address}:{$account.5.sip_port}</P702>
+{else}
+    <P702>{$account.5.server_address}</P702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
 
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3911,7 +3931,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P703>
 {else}
     <P703>{$account.5.outbound_proxy_primary}</P703>
@@ -3920,7 +3940,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index b8be9608e0..72be3c7a69 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -985,12 +989,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -999,7 +1007,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1008,7 +1016,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1934,12 +1942,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1948,7 +1960,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1957,7 +1969,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2882,12 +2894,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2896,7 +2912,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2905,7 +2921,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3833,12 +3849,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P702>{$account.5.server_address}:{$account.5.sip_port}</P702>
+{else}
+    <P702>{$account.5.server_address}</P702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
 
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3847,7 +3867,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P703>
 {else}
     <P703>{$account.5.outbound_proxy_primary}</P703>
@@ -3856,7 +3876,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
@@ -4781,12 +4801,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.6.sip_transport != 'dns srv'}
     <P1802>{$account.6.server_address}:{$account.6.sip_port}</P1802>
+{else}
+    <P1802>{$account.6.server_address}</P1802>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.6.server_address_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)}
     <P2812>{$account.6.server_address_secondary}:{$account.6.sip_port}</P2812>
 {else}
     <P2812>{$account.6.server_address_secondary}</P2812>
@@ -4795,7 +4819,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_primary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)}
     <P1803>{$account.6.outbound_proxy_primary}:{$account.6.sip_port}</P1803>
 {else}
     <P1803>{$account.6.outbound_proxy_primary}</P1803>
@@ -4804,7 +4828,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)}
     <P2833>{$account.5.outbound_proxy_secondary}:{$account.6.sip_port}</P2833>
 {else}
     <P2833>{$account.6.outbound_proxy_secondary}</P2833>
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 6a770d47d2..c3350960fc 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -1004,12 +1008,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -1018,7 +1026,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1027,7 +1035,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1973,12 +1981,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1987,7 +1999,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1996,7 +2008,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2941,12 +2953,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     <P2612></P2612>
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2955,7 +2971,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2964,7 +2980,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3912,12 +3928,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P702>{$account.5.server_address}:{$account.5.sip_port}</P702>
+{else}
+    <P702>{$account.5.server_address}</P702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     <P2712></P2712>
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3926,7 +3946,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P703>
 {else}
     <P703>{$account.5.outbound_proxy_primary}</P703>
@@ -3935,7 +3955,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     <P2733></P2733>
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index c29799eea5..ffacc1510a 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -27,11 +27,15 @@
 <P270>{$account.1.display_name}</P270>
 <!--  SIP Server -->
 <!--  String -->
+{if $account.1.sip_transport != 'dns srv'}
 <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+<P47>{$account.1.server_address}</P47>
+{/if}
 <!--  Secondary SIP Server -->
 <!--  String -->
 
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
 <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
 <P2312>{$account.1.server_address_secondary}</P2312>
@@ -40,7 +44,7 @@
 <!--  Outbound Proxy -->
 <!--  String -->
 
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
 <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
 <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -49,7 +53,7 @@
 <!--  Backup Outbound Proxy -->
 <!--  String -->
   
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
 <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
 <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -629,12 +633,16 @@
 <P417>{$account.2.display_name}</P417>
 <!--  SIP Server -->
 <!--  String -->
+{if $account.2.sip_transport != 'dns srv'}
 <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+<P402>{$account.2.server_address}</P402>
+{/if}
 
 <!--  Secondary SIP Server -->
 <!--  String -->
 
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
 <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
 <P2412>{$account.2.server_address_secondary}</P2412>
@@ -643,7 +651,7 @@
 <!--  Outbound Proxy -->
 <!--  String -->
 
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
 <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
 <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -652,7 +660,7 @@
 <!--  Backup Outbound Proxy -->
 <!--  String -->
 
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
 <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
 <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1212,12 +1220,16 @@
 
 <!--  SIP Server -->
 <!--  String -->
+{if $account.3.sip_transport != 'dns srv'}
 <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+<P502>{$account.3.server_address}</P502>
+{/if}
 
 <!--  Secondary SIP Server -->
 <!--  String -->
 
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
 <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
 <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1226,7 +1238,7 @@
 <!--  Outbound Proxy -->
 <!--  String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
 <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
 <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1235,7 +1247,7 @@
 <!--  Backup Outbound Proxy -->
 <!--  String  -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
 <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
 <P2533>{$account.3.outbound_proxy_secondary}</P2533>
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index 812044fc97..bfb62b6b77 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -773,7 +773,11 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
 <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+<P47>{$account.1.server_address}</P47>
+{/if}
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -781,7 +785,7 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
 <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
 <P48></P48>
@@ -789,7 +793,7 @@
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
 <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
 <P2333></P2333>
@@ -1484,7 +1488,11 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
 <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+<P402>{$account.2.server_address}</P402>
+{/if}
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -1492,7 +1500,7 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
 <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
 <P403></P403>
@@ -1500,7 +1508,7 @@
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
 <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
 <P2433></P2433>
@@ -2184,7 +2192,11 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
 <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+<P502>{$account.3.server_address}</P502>
+{/if}
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -2192,7 +2204,7 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
 <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
 <P503></P503>
@@ -2200,7 +2212,7 @@
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
 <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
 <P2533></P2533>
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 6b49a43693..c5615e3ffe 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -989,12 +993,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -1003,7 +1011,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1012,7 +1020,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1938,12 +1946,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1952,7 +1964,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1961,7 +1973,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2886,12 +2898,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2900,7 +2916,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2909,7 +2925,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3837,12 +3853,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P1702>{$account.5.server_address}:{$account.5.sip_port}</P1702>
+{else}
+    <P1702>{$account.5.server_address}</P1702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
 
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3851,7 +3871,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P1703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P1703>
 {else}
     <P1703>{$account.5.outbound_proxy_primary}</P1703>
@@ -3860,7 +3880,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
@@ -4785,12 +4805,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.6.sip_transport != 'dns srv'}
     <P1802>{$account.6.server_address}:{$account.6.sip_port}</P1802>
+{else}
+    <P1802>{$account.6.server_address}</P1802>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.6.server_address_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)}
     <P2812>{$account.6.server_address_secondary}:{$account.6.sip_port}</P2812>
 {else}
     <P2812>{$account.6.server_address_secondary}</P2812>
@@ -4799,7 +4823,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_primary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)}
     <P1803>{$account.6.outbound_proxy_primary}:{$account.6.sip_port}</P1803>
 {else}
     <P1803>{$account.6.outbound_proxy_primary}</P1803>
@@ -4808,7 +4832,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)}
     <P2833>{$account.5.outbound_proxy_secondary}:{$account.6.sip_port}</P2833>
 {else}
     <P2833>{$account.6.outbound_proxy_secondary}</P2833>
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index f3d420b5d1..ae10e1ef0f 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -989,12 +993,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -1003,7 +1011,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1012,7 +1020,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1938,12 +1946,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1952,7 +1964,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1961,7 +1973,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2886,12 +2898,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2900,7 +2916,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2909,7 +2925,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3837,12 +3853,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P1702>{$account.5.server_address}:{$account.5.sip_port}</P1702>
+{else}
+    <P1702>{$account.5.server_address}</P1702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
 
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3851,7 +3871,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P1703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P1703>
 {else}
     <P1703>{$account.5.outbound_proxy_primary}</P1703>
@@ -3860,7 +3880,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
@@ -4785,12 +4805,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.6.sip_transport != 'dns srv'}
     <P1802>{$account.6.server_address}:{$account.6.sip_port}</P1802>
+{else}
+    <P1802>{$account.6.server_address}</P1802>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.6.server_address_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)}
     <P2812>{$account.6.server_address_secondary}:{$account.6.sip_port}</P2812>
 {else}
     <P2812>{$account.6.server_address_secondary}</P2812>
@@ -4799,7 +4823,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_primary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)}
     <P1803>{$account.6.outbound_proxy_primary}:{$account.6.sip_port}</P1803>
 {else}
     <P1803>{$account.6.outbound_proxy_primary}</P1803>
@@ -4808,7 +4832,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)}
     <P2833>{$account.5.outbound_proxy_secondary}:{$account.6.sip_port}</P2833>
 {else}
     <P2833>{$account.6.outbound_proxy_secondary}</P2833>
@@ -5722,7 +5746,6 @@
     <!-- # Mandatory -->
     {if isset($grandstream_ipv_mode)}<P1415>{$grandstream_ipv_mode}</P1415>{else}<P1415>0</P1415>{/if}
 
-
     <!-- # IP Address Mode. 0 - DHCP, 1 - Static IP, 2 - PPPoE. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 1013d302e8..512abbbd9e 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -989,12 +993,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -1003,7 +1011,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1012,7 +1020,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1938,12 +1946,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1952,7 +1964,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1961,7 +1973,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2886,12 +2898,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2900,7 +2916,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2909,7 +2925,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3837,12 +3853,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P1702>{$account.5.server_address}:{$account.5.sip_port}</P1702>
+{else}
+    <P1702>{$account.5.server_address}</P1702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
 
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3851,7 +3871,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P1703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P1703>
 {else}
     <P1703>{$account.5.outbound_proxy_primary}</P1703>
@@ -3860,7 +3880,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
@@ -4785,12 +4805,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.6.sip_transport != 'dns srv'}
     <P1802>{$account.6.server_address}:{$account.6.sip_port}</P1802>
+{else}
+    <P1802>{$account.6.server_address}</P1802>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.6.server_address_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)}
     <P2812>{$account.6.server_address_secondary}:{$account.6.sip_port}</P2812>
 {else}
     <P2812>{$account.6.server_address_secondary}</P2812>
@@ -4799,7 +4823,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_primary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)}
     <P1803>{$account.6.outbound_proxy_primary}:{$account.6.sip_port}</P1803>
 {else}
     <P1803>{$account.6.outbound_proxy_primary}</P1803>
@@ -4808,7 +4832,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)}
     <P2833>{$account.5.outbound_proxy_secondary}:{$account.6.sip_port}</P2833>
 {else}
     <P2833>{$account.6.outbound_proxy_secondary}</P2833>
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 0fd095b8bc..11089a69b8 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -989,12 +993,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -1003,7 +1011,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1012,7 +1020,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1938,12 +1946,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1952,7 +1964,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1961,7 +1973,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2886,12 +2898,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2900,7 +2916,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2909,7 +2925,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3837,12 +3853,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P1702>{$account.5.server_address}:{$account.5.sip_port}</P1702>
+{else}
+    <P1702>{$account.5.server_address}</P1702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
 
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3851,7 +3871,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P1703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P1703>
 {else}
     <P1703>{$account.5.outbound_proxy_primary}</P1703>
@@ -3860,7 +3880,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
@@ -4785,12 +4805,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.6.sip_transport != 'dns srv'}
     <P1802>{$account.6.server_address}:{$account.6.sip_port}</P1802>
+{else}
+    <P1802>{$account.6.server_address}</P1802>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.6.server_address_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)}
     <P2812>{$account.6.server_address_secondary}:{$account.6.sip_port}</P2812>
 {else}
     <P2812>{$account.6.server_address_secondary}</P2812>
@@ -4799,7 +4823,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_primary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)}
     <P1803>{$account.6.outbound_proxy_primary}:{$account.6.sip_port}</P1803>
 {else}
     <P1803>{$account.6.outbound_proxy_primary}</P1803>
@@ -4808,7 +4832,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)}
     <P2833>{$account.5.outbound_proxy_secondary}:{$account.6.sip_port}</P2833>
 {else}
     <P2833>{$account.6.outbound_proxy_secondary}</P2833>
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index af8f1522f4..ccce52b8ee 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -27,12 +27,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
     <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -41,7 +45,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -50,7 +54,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -989,12 +993,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
     <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -1003,7 +1011,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -1012,7 +1020,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>
@@ -1938,12 +1946,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.3.sip_transport != 'dns srv'}
     <P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
+{else}
+    <P502>{$account.3.server_address}</P502>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.3.server_address_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)}
     <P2512>{$account.3.server_address_secondary}:{$account.3.sip_port}</P2512>
 {else}
     <P2512>{$account.3.server_address_secondary}</P2512>
@@ -1952,7 +1964,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_primary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)}
     <P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
 {else}
     <P503>{$account.3.outbound_proxy_primary}</P503>
@@ -1961,7 +1973,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.3.outbound_proxy_secondary)}
+{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)}
     <P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
 {else}
     <P2533>{$account.3.outbound_proxy_secondary}</P2533>
@@ -2886,12 +2898,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.4.sip_transport != 'dns srv'}
     <P602>{$account.4.server_address}:{$account.4.sip_port}</P602>
+{else}
+    <P602>{$account.4.server_address}</P602>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.4.server_address_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)}
     <P2612>{$account.4.server_address_secondary}:{$account.4.sip_port}</P2612>
 {else}
     <P2612>{$account.4.server_address_secondary}</P2612>
@@ -2900,7 +2916,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_primary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)}
     <P603>{$account.4.outbound_proxy_primary}:{$account.4.sip_port}</P603>
 {else}
     <P603>{$account.4.outbound_proxy_primary}</P603>
@@ -2909,7 +2925,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
     
-{if isset($account.4.outbound_proxy_secondary)}
+{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)}
     <P2633>{$account.4.outbound_proxy_secondary}:{$account.4.sip_port}</P2633>
 {else}
     <P2633>{$account.4.outbound_proxy_secondary}</P2633>
@@ -3837,12 +3853,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.5.sip_transport != 'dns srv'}
     <P1702>{$account.5.server_address}:{$account.5.sip_port}</P1702>
+{else}
+    <P1702>{$account.5.server_address}</P1702>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
 
-{if isset($account.5.server_address_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)}
     <P2712>{$account.5.server_address_secondary}:{$account.5.sip_port}</P2712>
 {else}
     <P2712>{$account.5.server_address_secondary}</P2712>
@@ -3851,7 +3871,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_primary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)}
     <P1703>{$account.5.outbound_proxy_primary}:{$account.5.sip_port}</P1703>
 {else}
     <P1703>{$account.5.outbound_proxy_primary}</P1703>
@@ -3860,7 +3880,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.5.outbound_proxy_secondary)}
+{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)}
     <P2733>{$account.5.outbound_proxy_secondary}:{$account.5.sip_port}</P2733>
 {else}
     <P2733>{$account.5.outbound_proxy_secondary}</P2733>
@@ -4785,12 +4805,16 @@
 
     <!-- # SIP Server -->
     <!-- # String -->
+{if $account.6.sip_transport != 'dns srv'}
     <P1802>{$account.6.server_address}:{$account.6.sip_port}</P1802>
+{else}
+    <P1802>{$account.6.server_address}</P1802>
+{/if}
 
     <!-- # Secondary SIP Server -->
     <!-- # String -->
     
-{if isset($account.6.server_address_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)}
     <P2812>{$account.6.server_address_secondary}:{$account.6.sip_port}</P2812>
 {else}
     <P2812>{$account.6.server_address_secondary}</P2812>
@@ -4799,7 +4823,7 @@
     <!-- # Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_primary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)}
     <P1803>{$account.6.outbound_proxy_primary}:{$account.6.sip_port}</P1803>
 {else}
     <P1803>{$account.6.outbound_proxy_primary}</P1803>
@@ -4808,7 +4832,7 @@
     <!-- # Backup Outbound Proxy -->
     <!-- # String -->
 
-{if isset($account.6.outbound_proxy_secondary)}
+{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)}
     <P2833>{$account.5.outbound_proxy_secondary}:{$account.6.sip_port}</P2833>
 {else}
     <P2833>{$account.6.outbound_proxy_secondary}</P2833>
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index 350d555608..826a49bc7d 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -516,7 +516,11 @@
 
 <!-- Primary SIP Server -->
 <!-- String: serveraddress -->
+{if $account.1.sip_transport != 'dns srv'}
 <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+<P47>{$account.1.server_address}</P47>
+{/if}
 
 <!-- Failover SIP Server -->
 <!-- String: serveraddress -->
@@ -530,7 +534,7 @@
 <!-- Outbound Proxy -->
 <!-- String: serveraddress -->
 
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
 <P48>{$account.1.outbound_proxy_primary}</P48>
diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml
index df654be25b..720faf2153 100644
--- a/resources/templates/provision/grandstream/ht801/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml
@@ -536,7 +536,11 @@
 
 <!-- Primary SIP Server -->
 <!-- Server address -->
+{if $account.1.sip_transport != 'dns srv'}
 <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+<P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Failover SIP Server -->
     <!-- # Server address -->
@@ -1800,7 +1804,7 @@
     <!-- # Internet Protocol. 0 - Both, prefer IPv4, 1 - Both, prefer IPv6, 2 - IPv4 Only, 3 - IPv6 Only. Default is IPv4 Only -->
     <!-- # Number: 0, 1, 2, 3 -->
     <!-- # Mandatory -->
-    <P1415>2</P1415>
+    {if isset($grandstream_ipv_mode)}<P1415>{$grandstream_ipv_mode}</P1415>{else}<P1415>0</P1415>{/if}
 
     <!-- # IP Address. 0 - DHCP, 2 - PPPoE, 1 - Static IP -->
     <!-- # Number: 0, 1, 2 -->
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index dc95b8e7fd..72343d0d3e 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -536,7 +536,11 @@
 
 <!-- Primary SIP Server -->
 <!-- Server address -->
+{if $account.1.sip_transport != 'dns srv'}
 <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+<P47>{$account.1.server_address}</P47>
+{/if}
 
     <!-- # Failover SIP Server -->
     <!-- # Server address -->
@@ -1441,7 +1445,11 @@
 
 <!-- Primary SIP Server -->
 <!-- Server address -->
+{if $account.2.sip_transport != 'dns srv'}
 <P747>{$account.2.server_address}:{$account.2.sip_port}</P747>
+{else}
+<P747>{$account.2.server_address}</P747>
+{/if}
 
     <!-- # Failover SIP Server -->
     <!-- # Server address -->
diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml
index f513dabdd6..0f983ca56e 100644
--- a/resources/templates/provision/grandstream/wp820/{$mac}.xml
+++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml
@@ -30,12 +30,16 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
+{if $account.1.sip_transport != 'dns srv'}
 <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+<P47>{$account.1.server_address}</P47>
+{/if}
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
     
-{if isset($account.1.server_address_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)}
     <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
 {else}
     <P2312>{$account.1.server_address_secondary}</P2312>
@@ -69,7 +73,7 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-{if isset($account.1.outbound_proxy_primary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)}
     <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
 {else}
     <P48>{$account.1.outbound_proxy_primary}</P48>
@@ -78,7 +82,7 @@
 <!-- # Secondary Outbound Proxy -->
 <!-- # String -->
     
-{if isset($account.1.outbound_proxy_secondary)}
+{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)}
     <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
 {else}
     <P2333>{$account.1.outbound_proxy_secondary}</P2333>
@@ -662,11 +666,15 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
+{if $account.2.sip_transport != 'dns srv'}
 <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+<P402>{$account.2.server_address}</P402>
+{/if}
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
-{if isset($account.2.server_address_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)}
     <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
 {else}
     <P2412>{$account.2.server_address_secondary}</P2412>
@@ -700,7 +708,7 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-{if isset($account.2.outbound_proxy_primary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)}
     <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
 {else}
     <P403>{$account.2.outbound_proxy_primary}</P403>
@@ -708,7 +716,7 @@
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
-{if isset($account.2.outbound_proxy_secondary)}
+{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)}
     <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
 {else}
     <P2433>{$account.2.outbound_proxy_secondary}</P2433>