diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg
index 15262b4b9f..b0ba5f0900 100644
--- a/resources/templates/provision/yealink/t48s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg
@@ -551,12 +551,19 @@ account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
+
 {if isset($account.2.server.1.address)}
 account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 {else}
 account.2.user_name = {$account.2.user_id}
 {/if}
-account.2.sip_server_host = {$account.2.server_address}
+
+{if isset($account.2.server.1.address)}
+account.2.sip_server.1.address = {$account.2.server.1.address}
+{else}
+account.2.sip_server.1.address = {$account.2.server_address}
+{/if}
+
 account.2.sip_server_port = {$account.2.sip_port}
 account.2.outbound_host = {$account.2.outbound_proxy}
 
@@ -574,6 +581,17 @@ account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
 account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
 account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
 
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
+{/if}
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
+{/if}
+
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -1037,20 +1055,24 @@ account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
+
 {if isset($account.3.server.1.address)}
 account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 {else}
 account.3.user_name = {$account.3.user_id}
 {/if}
-account.3.sip_server_host = {$account.3.server_address}
+
+{if isset($account.3.server.1.address)}
+account.3.sip_server.1.address = {$account.3.server.1.address}
+{else}
+account.3.sip_server.1.address = {$account.3.server_address}
+{/if}
+
 account.3.sip_server_port = {$account.3.sip_port}
 account.3.outbound_host = {$account.3.outbound_proxy}
-
 account.3.outbound_port = {$account.3.sip_port}
 {if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if}
 
-account.3.sip_listen_port = 5060
-#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if}
 {if $account.3.sip_transport == 'tcp'}account.3.transport = 1{/if}
 {if $account.3.sip_transport == 'tls'}account.3.transport = 2{/if}
@@ -1060,6 +1082,17 @@ account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
 account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
 account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
 
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.3.outbound_proxy.1.port = {$account.3.sip_port}
+{/if}
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.3.outbound_proxy.2.port = {$account.3.sip_port}
+{/if}
+
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -1514,20 +1547,24 @@ account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
+
 {if isset($account.4.server.1.address)}
 account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 {else}
 account.4.user_name = {$account.4.user_id}
 {/if}
-account.4.sip_server_host = {$account.4.server_address}
+
+{if isset($account.4.server.1.address)}
+account.4.sip_server.1.address = {$account.4.server.1.address}
+{else}
+account.4.sip_server.1.address = {$account.4.server_address}
+{/if}
+
 account.4.sip_server_port = {$account.4.sip_port}
 account.4.outbound_host = {$account.4.outbound_proxy}
-
 account.4.outbound_port = {$account.4.sip_port}
 {if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if}
 
-account.4.sip_listen_port = 5060
-#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if}
 {if $account.4.sip_transport == 'tcp'}account.4.transport = 1{/if}
 {if $account.4.sip_transport == 'tls'}account.4.transport = 2{/if}
@@ -1537,6 +1574,17 @@ account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
 account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
 account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
 
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.4.outbound_proxy.1.port = {$account.4.sip_port}
+{/if}
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.4.outbound_proxy.2.port = {$account.4.sip_port}
+{/if}
+
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -1986,20 +2034,24 @@ account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
+
 {if isset($account.5.server.1.address)}
 account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 {else}
 account.5.user_name = {$account.5.user_id}
 {/if}
-account.5.sip_server_host = {$account.5.server_address}
+
+{if isset($account.5.server.1.address)}
+account.5.sip_server.1.address = {$account.5.server.1.address}
+{else}
+account.5.sip_server.1.address = {$account.5.server_address}
+{/if}
+
 account.5.sip_server_port = {$account.5.sip_port}
 account.5.outbound_host = {$account.5.outbound_proxy}
-
 account.5.outbound_port = {$account.5.sip_port}
 {if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if}
 
-account.5.sip_listen_port = 5060
-#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if}
 {if $account.5.sip_transport == 'tcp'}account.5.transport = 1{/if}
 {if $account.5.sip_transport == 'tls'}account.5.transport = 2{/if}
@@ -2009,6 +2061,17 @@ account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
 account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
 account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
 
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.5.outbound_proxy.1.port = {$account.5.sip_port}
+{/if}
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.5.outbound_proxy.2.port = {$account.5.sip_port}
+{/if}
+
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -2458,20 +2521,24 @@ account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
+
 {if isset($account.6.server.1.address)}
 account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 {else}
 account.6.user_name = {$account.6.user_id}
 {/if}
-account.6.sip_server_host = {$account.6.server_address}
+
+{if isset($account.6.server.1.address)}
+account.6.sip_server.1.address = {$account.6.server.1.address}
+{else}
+account.6.sip_server.1.address = {$account.6.server_address}
+{/if}
+
 account.6.sip_server_port = {$account.6.sip_port}
 account.6.outbound_host = {$account.6.outbound_proxy}
-
 account.6.outbound_port = {$account.6.sip_port}
 {if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if}
 
-account.6.sip_listen_port = 5060
-#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if}
 {if $account.6.sip_transport == 'tcp'}account.6.transport = 1{/if}
 {if $account.6.sip_transport == 'tls'}account.6.transport = 2{/if}
@@ -2481,6 +2548,17 @@ account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}
 account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
 account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
 
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.6.outbound_proxy.1.port = {$account.6.sip_port}
+{/if}
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.6.outbound_proxy.2.port = {$account.6.sip_port}
+{/if}
+
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################