diff --git a/resources/templates/provision/yealink/t53w/{$mac}.cfg b/resources/templates/provision/yealink/t53w/{$mac}.cfg
index 734c94d05b..ef09c969e0 100644
--- a/resources/templates/provision/yealink/t53w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t53w/{$mac}.cfg
@@ -123,7 +123,8 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
+{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.sip_server.1.port= {$account.1.sip_port}
 
 
@@ -199,7 +200,7 @@ account.1.ptime= 20
 account.1.register_line=
 account.1.register_mac=
 account.1.reg_fail_retry_interval=
-account.1.unregister_on_reboot=
+account.1.unregister_on_reboot=1
 
 account.1.session_timer.refresher=
 account.1.session_timer.expires=
@@ -662,7 +663,8 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-account.2.sip_server.1.address= {$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.1.port= {$account.2.sip_port}
 
 
@@ -1189,7 +1191,8 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-account.3.sip_server.1.address= {$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.1.port= {$account.3.sip_port}
 
 
@@ -1716,7 +1719,8 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-account.4.sip_server.1.address= {$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.1.port= {$account.4.sip_port}
 
 
@@ -2242,7 +2246,8 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-account.5.sip_server.1.address= {$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.1.port= {$account.5.sip_port}
 
 
@@ -2782,7 +2787,8 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-account.6.sip_server.1.address= {$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.1.port= {$account.6.sip_port}
 
 
@@ -3309,7 +3315,8 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-account.7.sip_server.1.address= {$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.1.port= {$account.7.sip_port}
 
 
@@ -3836,7 +3843,8 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-account.8.sip_server.1.address= {$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.1.port= {$account.8.sip_port}
 
 
@@ -4363,7 +4371,8 @@ account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
 account.9.user_name = {$account.9.user_id}
 {/if}
 
-account.9.sip_server.1.address= {$account.9.server_address}
+{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address} {else} account.9.sip_server.1.address= {$account.9.server_address} {/if}
+
 account.9.sip_server.1.port= {$account.9.sip_port}
 
 
@@ -4890,7 +4899,8 @@ account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
 account.10.user_name = {$account.10.user_id}
 {/if}
 
-account.10.sip_server.1.address= {$account.10.server_address}
+{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address} {else} account.10.sip_server.1.address= {$account.10.server_address} {/if}
+
 account.10.sip_server.1.port= {$account.10.sip_port}
 
 
diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg
index 734c94d05b..42c6991f4e 100644
--- a/resources/templates/provision/yealink/t54w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg
@@ -123,7 +123,8 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
+{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.sip_server.1.port= {$account.1.sip_port}
 
 
@@ -199,7 +200,7 @@ account.1.ptime= 20
 account.1.register_line=
 account.1.register_mac=
 account.1.reg_fail_retry_interval=
-account.1.unregister_on_reboot=
+account.1.unregister_on_reboot=1
 
 account.1.session_timer.refresher=
 account.1.session_timer.expires=
@@ -662,7 +663,8 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-account.2.sip_server.1.address= {$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.1.port= {$account.2.sip_port}
 
 
@@ -738,7 +740,7 @@ account.2.ptime= 20
 account.2.register_line=
 account.2.register_mac=
 account.2.reg_fail_retry_interval=
-account.2.unregister_on_reboot=
+account.2.unregister_on_reboot=1
 
 account.2.session_timer.refresher=
 account.2.session_timer.expires=
@@ -1189,7 +1191,8 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-account.3.sip_server.1.address= {$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.1.port= {$account.3.sip_port}
 
 
@@ -1716,7 +1719,8 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-account.4.sip_server.1.address= {$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.1.port= {$account.4.sip_port}
 
 
@@ -2242,7 +2246,8 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-account.5.sip_server.1.address= {$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.1.port= {$account.5.sip_port}
 
 
@@ -2782,7 +2787,8 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-account.6.sip_server.1.address= {$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.1.port= {$account.6.sip_port}
 
 
@@ -3309,7 +3315,8 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-account.7.sip_server.1.address= {$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.1.port= {$account.7.sip_port}
 
 
@@ -3836,7 +3843,8 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-account.8.sip_server.1.address= {$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.1.port= {$account.8.sip_port}
 
 
@@ -4363,7 +4371,8 @@ account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
 account.9.user_name = {$account.9.user_id}
 {/if}
 
-account.9.sip_server.1.address= {$account.9.server_address}
+{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address} {else} account.9.sip_server.1.address= {$account.9.server_address} {/if}
+
 account.9.sip_server.1.port= {$account.9.sip_port}
 
 
@@ -4890,7 +4899,8 @@ account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
 account.10.user_name = {$account.10.user_id}
 {/if}
 
-account.10.sip_server.1.address= {$account.10.server_address}
+{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address} {else} account.10.sip_server.1.address= {$account.10.server_address} {/if}
+
 account.10.sip_server.1.port= {$account.10.sip_port}
 
 
diff --git a/resources/templates/provision/yealink/w60b/y000000000077.cfg b/resources/templates/provision/yealink/w60b/y000000000077.cfg
index 5c8a92c78f..7d8efabc9d 100644
--- a/resources/templates/provision/yealink/w60b/y000000000077.cfg
+++ b/resources/templates/provision/yealink/w60b/y000000000077.cfg
@@ -338,6 +338,7 @@ firmware.url = {$yealink_firmware_url}/{$yealink_firmware_w60b}
 #######################################################################################
 
 over_the_air.url = {$yealink_firmware_url}/{$yealink_w56h_handset_firmware_url}
+over_the_air.url.w59r = {$yealink_firmware_url}/{$yealink_w59r_handset_firmware_url}
 over_the_air.base_trigger = 1
 over_the_air.handset_tip = 1
 
diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index afa8352483..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}{""}
 
@@ -284,6 +291,8 @@ account.1.dnd.enable =
 
 account.1.sip_trust_ctrl = 1
 
+voice_mail.number.1 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 2 Settings                              ##
 #######################################################################################
@@ -293,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}{""}
 
@@ -520,6 +537,8 @@ account.2.dnd.enable =
 
 account.2.sip_trust_ctrl = 1
 
+voice_mail.number.2 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 3 Settings                              ##
 #######################################################################################
@@ -529,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}{""}
 
@@ -756,6 +783,8 @@ account.3.dnd.enable =
 
 account.3.sip_trust_ctrl = 1
 
+voice_mail.number.3 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 4 Settings                              ##
 #######################################################################################
@@ -765,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}{""}
 
@@ -992,6 +1029,8 @@ account.4.dnd.enable =
 
 account.4.sip_trust_ctrl = 1
 
+voice_mail.number.4 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 5 Settings                              ##
 #######################################################################################
@@ -1001,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}{""}
 
@@ -1228,7 +1275,7 @@ account.5.dnd.enable =
 
 account.5.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.5 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1258,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
@@ -1485,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                                         ##
@@ -1515,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}{""}
 
@@ -1742,7 +1805,7 @@ account.7.dnd.enable =
 
 account.7.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.7= {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1772,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}{""}
 
@@ -1999,7 +2070,7 @@ account.8.dnd.enable =
 
 account.8.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.8 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -2019,3 +2090,16 @@ network.internet_port.gateway =
 {if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}{""}
 
 {if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""}
+
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.1.shared_line= {$shared_line_1}
+account.2.shared_line= {$shared_line_2}
+account.3.shared_line= {$shared_line_3}
+account.4.shared_line= {$shared_line_4}
+account.5.shared_line= {$shared_line_5}
+account.6.shared_line= {$shared_line_6}
+account.7.shared_line= {$shared_line_7}
+account.8.shared_line= {$shared_line_8}