diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index 57b8268359..2f3f5624ed 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -4,7 +4,7 @@
 ##File header "#!version:1.0.0.1" can not be edited or deleted.##
 
 #######################################################################################
-##                                   Account1 Settings                               ##
+##                                   Account 1 Settings                              ##
 #######################################################################################
 
 #Basic Settings
@@ -16,7 +16,7 @@ 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 $sip_transport_1 == 'tls'}2{/if}{if $sip_transport_1 == 'dns srv'}3{/if}{""}
+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}{""}
 account.1.expires = {$account.1.register_expires}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
@@ -24,16 +24,16 @@ account.1.outbound_port = {$account.1.sip_port}
 #Server Redundancy
 account.1.sip_server.2.address= {$account.1.server.2.address}
 account.1.sip_server.2.port= {$account.1.sip_port}
-account.1.sip_server.2.transport_type = {if $sip_transport_1 == 'udp'}0{/if}{if $sip_transport_1 == 'tcp'}1{/if}{if $sip_transport_1 == 'tls'}2{/if}{if $sip_transport_1 == 'dns srv'}3{/if}{""}
+account.1.sip_server.2.transport_type = {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}{""}
 account.1.sip_server.2.expires= {$account.1.register_expires}
 account.1.retry_counts = 3
 
 #Basic Proxy Settings
-account.1.outbound_proxy_enable= {if isset($outbound_proxy_primary_1)}1{else}0{/if}{""}
+account.1.outbound_proxy_enable= {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}{""}
 account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
-account.1.outbound_proxy.1.port = {if isset($outbound_proxy_1_port)}{$outbound_proxy_1_port}{else}5060{/if}{""}
+account.1.outbound_proxy.1.port = {if isset($account.1.sip_port)}{$account.1.sip_port}{else}5060{/if}{""}
 account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
-account.1.outbound_proxy.2.port = {if isset($outbound_proxy_1_port)}{$outbound_proxy_1_port}{else}5060{/if}{""}
+account.1.outbound_proxy.2.port = {if isset($account.1.sip_port)}{$account.1.sip_port}{else}5060{/if}{""}
 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -231,7 +231,7 @@ account.1.dnd.enable =
 account.1.sip_trust_ctrl = 1
 
 #######################################################################################
-##                                   Account2 Settings                               ##
+##                                   Account 2 Settings                              ##
 #######################################################################################
 
 #Basic Settings
@@ -256,11 +256,11 @@ account.2.sip_server.2.expires= {$account.2.register_expires}
 account.2.retry_counts = 3
 
 #Basic Proxy Settings
-account.2.outbound_proxy_enable= {if isset($outbound_proxy_primary_2)}1{else}0{/if}{""}
+account.2.outbound_proxy_enable= {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}{""}
 account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
-account.2.outbound_proxy.1.port = {if isset($outbound_proxy_2_port)}{$outbound_proxy_2_port}{else}5060{/if}{""}
+account.2.outbound_proxy.1.port = {if isset($account.2.sip_port)}{$account.2.sip_port}{else}5060{/if}{""}
 account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
-account.2.outbound_proxy.2.port = {if isset($outbound_proxy_2_port)}{$outbound_proxy_2_port}{else}5060{/if}{""}
+account.2.outbound_proxy.2.port = {if isset($account.2.sip_port)}{$account.2.sip_port}{else}5060{/if}{""}
 account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -461,7 +461,7 @@ account.2.dnd.enable =
 account.2.sip_trust_ctrl = 1
 
 #######################################################################################
-##                                   Account3 Settings                               ##
+##                                   Account 3 Settings                              ##
 #######################################################################################
 
 #Basic Settings
@@ -481,16 +481,16 @@ account.3.outbound_port = {$sip_port}
 #Server Redundancy
 account.3.sip_server.2.address= {$account.3.server.2.address}
 account.3.sip_server.2.port= {$account.3.sip_port}
-account.3.sip_server.2.transport_type = {if $sip_transport_3 == '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}{""}
+account.3.sip_server.2.transport_type = {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}{""}
 account.3.sip_server.2.expires= {$account.3.register_expires}
 account.3.retry_counts = 3
 
 #Basic Proxy Settings
 account.3.outbound_proxy_enable= {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}{""}
 account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
-account.3.outbound_proxy.1.port = {if isset($outbound_proxy_3_port)}{$outbound_proxy_3_port}{else}5060{/if}{""}
+account.3.outbound_proxy.1.port = {if isset($account.3.sip_port)}{$account.3.sip_port}{else}5060{/if}{""}
 account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
-account.3.outbound_proxy.2.port = {if isset($outbound_proxy_3_port)}{$outbound_proxy_3_port}{else}5060{/if}{""}
+account.3.outbound_proxy.2.port = {if isset($account.3.sip_port)}{$account.3.sip_port}{else}5060{/if}{""}
 account.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -691,7 +691,7 @@ account.3.dnd.enable =
 account.3.sip_trust_ctrl = 1
 
 #######################################################################################
-##                                   Account4 Settings                               ##
+##                                   Account 4 Settings                              ##
 #######################################################################################
 
 #Basic Settings
@@ -716,11 +716,11 @@ account.4.sip_server.2.expires= {$account.4.register_expires}
 account.4.retry_counts = 3
 
 #Basic Proxy Settings
-account.4.outbound_proxy_enable= {if isset($outbound_proxy_primary_4)}1{else}0{/if}{""}
-account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4}
-account.4.outbound_proxy.1.port = {if isset($outbound_proxy_4_port)}{$outbound_proxy_4_port}{else}5060{/if}{""}
-account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4}
-account.4.outbound_proxy.2.port = {if isset($outbound_proxy_4_port)}{$outbound_proxy_4_port}{else}5060{/if}{""}
+account.4.outbound_proxy_enable= {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}{""}
+account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
+account.4.outbound_proxy.1.port = {if isset($account.4.sip_port)}{$account.4.sip_port}{else}5060{/if}{""}
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+account.4.outbound_proxy.2.port = {if isset($account.4.sip_port)}{$account.4.sip_port}{else}5060{/if}{""}
 account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -921,7 +921,7 @@ account.4.dnd.enable =
 account.4.sip_trust_ctrl = 1
 
 #######################################################################################
-##                                   Account5 Settings                               ##
+##                                   Account 5 Settings                              ##
 #######################################################################################
 
 #Basic Settings
@@ -948,9 +948,9 @@ account.5.retry_counts = 3
 #Basic Proxy Settings
 account.5.outbound_proxy_enable= {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}{""}
 account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
-account.5.outbound_proxy.1.port = {if isset($outbound_proxy_5_port)}{$outbound_proxy_5_port}{else}5060{/if}{""}
+account.5.outbound_proxy.1.port = {if isset($account.5.sip_port)}{$account.5.sip_port}{else}5060{/if}{""}
 account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
-account.5.outbound_proxy.2.port = {if isset($outbound_proxy_5_port)}{$outbound_proxy_5_port}{else}5060{/if}{""}
+account.5.outbound_proxy.2.port = {if isset($account.5.sip_port)}{$account.4.sip_port}{else}5060{/if}{""}
 account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -1170,7 +1170,7 @@ network.internet_port.gateway =
 {if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""}
 
 #######################################################################################
-##                                   Account6 Settings                               ##
+##                                   Account 6 Settings                              ##
 #######################################################################################
 
 #Basic Settings
@@ -1197,9 +1197,9 @@ account.6.retry_counts = 3
 #Basic Proxy Settings
 account.6.outbound_proxy_enable= {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}{""}
 account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}
-account.6.outbound_proxy.1.port = {if isset($outbound_proxy_6_port)}{$outbound_proxy_6_port}{else}5060{/if}{""}
+account.6.outbound_proxy.1.port = {if isset($account.6.sip_port)}{$account.6.sip_port}{else}5060{/if}{""}
 account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
-account.6.outbound_proxy.2.port = {if isset($outbound_proxy_6_port)}{$outbound_proxy_6_port}{else}5060{/if}{""}
+account.6.outbound_proxy.2.port = {if isset($account.6.sip_port)}{$account.6.sip_port}{else}5060{/if}{""}
 account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -1419,36 +1419,36 @@ network.internet_port.gateway =
 {if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""}
 
 #######################################################################################
-##                                   Account7 Settings                               ##
+##                                   Account 7 Settings                              ##
 #######################################################################################
 
 #Basic Settings
-account.7.enable = {if isset($user_password_7) }1{else}0{/if}{""}
-account.7.label = {$display_name_7}
-account.7.display_name = {$display_name_7}
-account.7.user_name = {$user_id_7}
-account.7.auth_name = {$user_id_7}
-account.7.password = {$user_password_7}
-account.7.sip_server_host = {$server_address_7}
-account.7.sip_server_port = {$sip_port_7}
-account.7.transport = {if $sip_transport_7 == 'udp'}0{/if}{if $sip_transport_7 == 'tcp'}1{/if}{if $sip_transport_7 == 'tls'}2{/if}{if $sip_transport_7 == 'dns srv'}3{/if}{""}
-account.7.expires = {$register_expires_7}
-account.7.outbound_host = {$outbound_proxy_7}
-account.7.outbound_port = {$sip_port_7}
+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}
+account.7.user_name = {$account.7.user_id}
+account.7.auth_name = {$account.7.user_id}
+account.7.password = {$account.7.user_password}
+account.7.sip_server_host = {$account.7.server_address}
+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}{""}
+account.7.expires = {$account.7.register_expires}
+account.7.outbound_host = {$account.7.outbound_proxy}
+account.7.outbound_port = {$account.7.sip_port}
 
 #Server Redundancy
-account.7.sip_server.2.address= {$server_address_7}
-account.7.sip_server.2.port= {$sip_port_7}
-account.7.sip_server.2.transport_type = {if $sip_transport_7 == 'udp'}0{/if}{if $sip_transport_7 == 'tcp'}1{/if}{if $sip_transport_7 == 'tls'}2{/if}{if $sip_transport_7 == 'dns srv'}3{/if}{""}
-account.7.sip_server.2.expires= {$register_expires_7}
+account.7.sip_server.2.address= {$account.7.server_address}
+account.7.sip_server.2.port= {$account.7.sip_port}
+account.7.sip_server.2.transport_type = {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}{""}
+account.7.sip_server.2.expires= {$account.7.register_expires}
 account.7.retry_counts = 3
 
 #Basic Proxy Settings
-account.7.outbound_proxy_enable= {if isset($outbound_proxy_primary_7)}1{else}0{/if}{""}
-account.7.outbound_proxy.1.address = {$outbound_proxy_primary_7}
-account.7.outbound_proxy.1.port = {if isset($outbound_proxy_7_port)}{$outbound_proxy_7_port}{else}5060{/if}{""}
-account.7.outbound_proxy.2.address = {$outbound_proxy_secondary_7}
-account.7.outbound_proxy.2.port = {if isset($outbound_proxy_7_port)}{$outbound_proxy_7_port}{else}5060{/if}{""}
+account.7.outbound_proxy_enable= {if isset($account.7.outbound_proxy_primary)}1{else}0{/if}{""}
+account.7.outbound_proxy.1.address = {$account.7.outbound_proxy_primary}
+account.7.outbound_proxy.1.port = {if isset($account.7.sip_port)}{$account.7.outbound_sip_port}{else}5060{/if}{""}
+account.7.outbound_proxy.2.address = {$account.7.outbound_proxy_secondary}
+account.7.outbound_proxy.2.port = {if isset($account.7.sip_port)}{$account.7.sip_port}{else}5060{/if}{""}
 account.7.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -1668,36 +1668,36 @@ network.internet_port.gateway =
 {if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""}
 
 #######################################################################################
-##                                   Account8 Settings                               ##
+##                                   Account 8 Settings                              ##
 #######################################################################################
 
 #Basic Settings
-account.8.enable = {if isset($user_password_8) }1{else}0{/if}{""}
-account.8.label = {$display_name_8}
-account.8.display_name = {$display_name_8}
-account.8.user_name = {$user_id_8}
-account.8.auth_name = {$user_id_8}
-account.8.password = {$user_password_8}
-account.8.sip_server_host = {$server_address_8}
-account.8.sip_server_port = {$sip_port_8}
-account.8.transport = {if $sip_transport_8 == 'udp'}0{/if}{if $sip_transport_8 == 'tcp'}1{/if}{if $sip_transport_8 == 'tls'}2{/if}{if $sip_transport_8 == 'dns srv'}3{/if}{""}
-account.8.expires = {$register_expires_8}
-account.8.outbound_host = {$outbound_proxy_8}
-account.8.outbound_port = {$sip_port_8}
+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}
+account.8.user_name = {$account.8.user_id}
+account.8.auth_name = {$account.8.user_id}
+account.8.password = {$account.8.user_password}
+account.8.sip_server_host = {$account.8.server_address}
+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}{""}
+account.8.expires = {$account.8.register_expires}
+account.8.outbound_host = {$account.8.outbound_proxy}
+account.8.outbound_port = {$account.8.sip_port}
 
 #Server Redundancy
-account.8.sip_server.2.address= {$server_address_8}
-account.8.sip_server.2.port= {$sip_port_8}
-account.8.sip_server.2.transport_type = {if $sip_transport_8 == 'udp'}0{/if}{if $sip_transport_8 == 'tcp'}1{/if}{if $sip_transport_8 == 'tls'}2{/if}{if $sip_transport_8 == 'dns srv'}3{/if}{""}
-account.8.sip_server.2.expires= {$register_expires_8}
+account.8.sip_server.2.address= {$account.8.server_address}
+account.8.sip_server.2.port= {$account.8.sip_port}
+account.8.sip_server.2.transport_type = {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}{""}
+account.8.sip_server.2.expires= {$account.8.register_expires}
 account.8.retry_counts = 3
 
 #Basic Proxy Settings
-account.8.outbound_proxy_enable= {if isset($outbound_proxy_primary_8)}1{else}0{/if}{""}
-account.8.outbound_proxy.1.address = {$outbound_proxy_primary_8}
-account.8.outbound_proxy.1.port = {if isset($outbound_proxy_8_port)}{$outbound_proxy_8_port}{else}5060{/if}{""}
-account.8.outbound_proxy.2.address = {$outbound_proxy_secondary_8}
-account.8.outbound_proxy.2.port = {if isset($outbound_proxy_8_port)}{$outbound_proxy_8_port}{else}5060{/if}{""}
+account.8.outbound_proxy_enable= {if isset($account.8.outbound_proxy_primary)}1{else}0{/if}{""}
+account.8.outbound_proxy.1.address = {$account.8.outbound_proxy_primary}
+account.8.outbound_proxy.1.port = {if isset($account.8.sip_port)}{$account.8.sip_port}{else}5060{/if}{""}
+account.8.outbound_proxy.2.address = {$account.8.outbound_proxy_secondary}
+account.8.outbound_proxy.2.port = {if isset($account.8.sip_port)}{$account.8.sip_port}{else}5060{/if}{""}
 account.8.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -1718,7 +1718,7 @@ account.8.anonymous_reject_offcode =
 account.8.sip_listen_port =
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.8.expires = {$register_expires_8}
+account.8.expires = {$account.8.register_expires}
 
 #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
 account.8.100rel_enable = {$yealink_retransmission}