diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index 7d7f9de8b0..717f851bb2 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -12,10 +12,17 @@ account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""}
 
 account.1.label = {$account.1.display_name}
 account.1.display_name = {$account.1.display_name}
+
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
 account.1.user_name = {$account.1.user_id}
+{/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
 account.1.auth_name = {$account.1.user_id}
 account.1.password = {$account.1.password}
-account.1.sip_server_host = {$account.1.server_address}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.transport = {if $account.1.sip_transport == 'udp'}0{/if}{if $account.1.sip_transport == 'tcp'}1{/if}{if $account.1.sip_transport == 'tls'}2{/if}{if $account.1.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -295,10 +302,18 @@ account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""}
 
 account.2.label = {$account.2.display_name}
 account.2.display_name = {$account.2.display_name}
+
+{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.auth_name = {$account.2.user_id}
 account.2.password = {$account.2.password}
-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.transport = {if $account.2.sip_transport == 'udp'}0{/if}{if $account.2.sip_transport == 'tcp'}1{/if}{if $account.2.sip_transport == 'tls'}2{/if}{if $account.2.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -533,10 +548,18 @@ account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""}
 
 account.3.label = {$account.3.display_name}
 account.3.display_name = {$account.3.display_name}
+
+{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.auth_name = {$account.3.user_id}
 account.3.password = {$account.3.password}
-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.transport = {if $account.3.sip_transport == 'udp'}0{/if}{if $account.3.sip_transport == 'tcp'}1{/if}{if $account.3.sip_transport == 'tls'}2{/if}{if $account.3.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -771,10 +794,18 @@ account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""}
 
 account.4.label = {$account.4.display_name}
 account.4.display_name = {$account.4.display_name}
+
+{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.auth_name = {$account.4.user_id}
 account.4.password = {$account.4.password}
-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.transport = {if $account.4.sip_transport == 'udp'}0{/if}{if $account.4.sip_transport == 'tcp'}1{/if}{if $account.4.sip_transport == 'tls'}2{/if}{if $account.4.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1009,10 +1040,18 @@ account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""}
 
 account.5.label = {$account.5.display_name}
 account.5.display_name = {$account.5.display_name}
+
+{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.auth_name = {$account.5.user_id}
 account.5.password = {$account.5.password}
-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.transport = {if $account.5.sip_transport == 'udp'}0{/if}{if $account.5.sip_transport == 'tcp'}1{/if}{if $account.5.sip_transport == 'tls'}2{/if}{if $account.5.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1266,10 +1305,18 @@ account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""}
 
 account.6.label = {$account.6.display_name}
 account.6.display_name = {$account.6.display_name}
+
+{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.auth_name = {$account.6.user_id}
 account.6.password = {$account.6.password}
-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.transport = {if $account.6.sip_transport == 'udp'}0{/if}{if $account.6.sip_transport == 'tcp'}1{/if}{if $account.6.sip_transport == 'tls'}2{/if}{if $account.6.sip_transport == 'dns srv'}3{/if}{""}
 a
@@ -1493,7 +1540,7 @@ account.6.dnd.enable =
 
 account.6.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.6 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1523,10 +1570,18 @@ account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""}
 
 account.7.label = {$account.7.display_name}
 account.7.display_name = {$account.7.display_name}
+
+{if isset($account.7.server.1.address)}
+account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
+{else}
 account.7.user_name = {$account.7.user_id}
+{/if}
+
 account.7.auth_name = {$account.7.user_id}
 account.7.password = {$account.7.user_password}
-account.7.sip_server_host = {$account.7.server_address}
+
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+
 account.7.sip_server_port = {$account.7.sip_port}
 account.7.transport = {if $account.7.sip_transport == 'udp'}0{/if}{if $account.7.sip_transport == 'tcp'}1{/if}{if $account.7.sip_transport == 'tls'}2{/if}{if $account.7.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1750,7 +1805,7 @@ account.7.dnd.enable =
 
 account.7.sip_trust_ctrl = 1
 
-voice_mail.number.7 = {$voicemail_number}
+voice_mail.number.7= {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1780,10 +1835,18 @@ account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""}
 
 account.8.label = {$account.8.display_name}
 account.8.display_name = {$account.8.display_name}
+
+{if isset($account.8.server.1.address)}
+account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
+{else}
 account.8.user_name = {$account.8.user_id}
+{/if}
+
 account.8.auth_name = {$account.8.user_id}
 account.8.password = {$account.8.user_password}
-account.8.sip_server_host = {$account.8.server_address}
+
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+
 account.8.sip_server_port = {$account.8.sip_port}
 account.8.transport = {if $account.8.sip_transport == 'udp'}0{/if}{if $account.8.sip_transport == 'tcp'}1{/if}{if $account.8.sip_transport == 'tls'}2{/if}{if $account.8.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -2028,6 +2091,7 @@ network.internet_port.gateway =
 
 {if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""}
 
+
 #######################################################################################
 ##                                   SCA                                             ##       
 #######################################################################################