diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index 753afc891b..57b8268359 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -235,31 +235,31 @@ account.1.sip_trust_ctrl = 1
 #######################################################################################
 
 #Basic Settings
-account.2.enable = {if isset($user_password_2) }1{else}0{/if}{""}
-account.2.label = {$display_name_2}
-account.2.display_name = {$display_name_2}
-account.2.user_name = {$user_id_2}
-account.2.auth_name = {$user_id_2}
-account.2.password = {$user_password_2}
-account.2.sip_server_host = {$server_address_2}
-account.2.sip_server_port = {$sip_port_2}
-account.2.transport = {if $sip_transport_2 == 'udp'}0{/if}{if $sip_transport_2 == 'tcp'}1{/if}{if $sip_transport_2 == 'tls'}2{/if}{if $sip_transport_2 == 'dns srv'}3{/if}{""}
-account.2.expires = {$register_expires_2}
-account.2.outbound_host = {$outbound_proxy_2}
-account.2.outbound_port = {$sip_port_2}
+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}
+account.2.user_name = {$account.2.user_id}
+account.2.auth_name = {$account.2.user_id}
+account.2.password = {$account.2.password}
+account.2.sip_server_host = {$account.2.server_address}
+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}{""}
+account.2.expires = {$account.2.register_expires}
+account.2.outbound_host = {$account.2.outbound_proxy}
+account.2.outbound_port = {$account.2.sip_port}
 
 #Server Redundancy
-account.2.sip_server.2.address= {$server_address_2}
-account.2.sip_server.2.port= {$sip_port_2}
-account.2.sip_server.2.transport_type = {if $sip_transport_2 == 'udp'}0{/if}{if $sip_transport_2 == 'tcp'}1{/if}{if $sip_transport_2 == 'tls'}2{/if}{if $sip_transport_2 == 'dns srv'}3{/if}{""}
-account.2.sip_server.2.expires= {$register_expires_2}
+account.2.sip_server.2.address= {$account.2.server.2.address}
+account.2.sip_server.2.port= {$account.2.sip_port}
+account.2.sip_server.2.transport_type = {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}{""}
+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.1.address = {$outbound_proxy_primary_2}
+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.2.address = {$outbound_proxy_secondary_2}
+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.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
@@ -281,7 +281,7 @@ account.2.anonymous_reject_offcode =
 account.2.sip_listen_port =
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.2.expires = {$register_expires_2}
+account.2.expires = {$account.2.register_expires}
 
 #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
 account.2.100rel_enable = {$yealink_retransmission}
@@ -465,31 +465,31 @@ account.2.sip_trust_ctrl = 1
 #######################################################################################
 
 #Basic Settings
-account.3.enable = {if isset($user_password_3) }1{else}0{/if}{""}
-account.3.label = {$display_name_3}
-account.3.display_name = {$display_name_3}
-account.3.user_name = {$user_id_3}
-account.3.auth_name = {$user_id_3}
-account.3.password = {$user_password_3}
-account.3.sip_server_host = {$server_address_3}
-account.3.sip_server_port = {$sip_port_3}
-account.3.transport = {if $sip_transport_3 == 'udp'}0{/if}{if $sip_transport_3 == 'tcp'}1{/if}{if $sip_transport_3 == 'tls'}2{/if}{if $sip_transport_3 == 'dns srv'}3{/if}{""}
-account.3.expires = {$register_expires_3}
-account.3.outbound_host = {$outbound_proxy_3}
-account.3.outbound_port = {$sip_port_3}
+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}
+account.3.user_name = {$account.3.user_id}
+account.3.auth_name = {$account.3.user_id}
+account.3.password = {$account.3.password}
+account.3.sip_server_host = {$account.3.server_address}
+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}{""}
+account.3.expires = {$register_expires}
+account.3.outbound_host = {$outbound_proxy}
+account.3.outbound_port = {$sip_port}
 
 #Server Redundancy
-account.3.sip_server.2.address= {$server_address_3}
-account.3.sip_server.2.port= {$sip_port_3}
-account.3.sip_server.2.transport_type = {if $sip_transport_3 == 'udp'}0{/if}{if $sip_transport_3 == 'tcp'}1{/if}{if $sip_transport_3 == 'tls'}2{/if}{if $sip_transport_3 == 'dns srv'}3{/if}{""}
-account.3.sip_server.2.expires= {$register_expires_3}
+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.expires= {$account.3.register_expires}
 account.3.retry_counts = 3
 
 #Basic Proxy Settings
-account.3.outbound_proxy_enable= {if isset($outbound_proxy_primary_3)}1{else}0{/if}{""}
-account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3}
+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.2.address = {$outbound_proxy_secondary_3}
+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.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
@@ -511,7 +511,7 @@ account.3.anonymous_reject_offcode =
 account.3.sip_listen_port =
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.3.expires = {$register_expires_3}
+account.3.expires = {$account.3.register_expires}
 
 #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
 account.3.100rel_enable = {$yealink_retransmission}
@@ -695,24 +695,24 @@ account.3.sip_trust_ctrl = 1
 #######################################################################################
 
 #Basic Settings
-account.4.enable = {if isset($user_password_4) }1{else}0{/if}{""}
-account.4.label = {$display_name_4}
-account.4.display_name = {$display_name_4}
-account.4.user_name = {$user_id_4}
-account.4.auth_name = {$user_id_4}
-account.4.password = {$user_password_4}
-account.4.sip_server_host = {$server_address_4}
-account.4.sip_server_port = {$sip_port_4}
-account.4.transport = {if $sip_transport_4 == 'udp'}0{/if}{if $sip_transport_4 == 'tcp'}1{/if}{if $sip_transport_4 == 'tls'}2{/if}{if $sip_transport_4 == 'dns srv'}3{/if}{""}
-account.4.expires = {$register_expires_4}
-account.4.outbound_host = {$outbound_proxy_4}
-account.4.outbound_port = {$sip_port_4}
+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}
+account.4.user_name = {$account.4.user_id}
+account.4.auth_name = {$account.4.user_id}
+account.4.password = {$account.4.password}
+account.4.sip_server_host = {$account.4.server_address}
+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}{""}
+account.4.expires = {$account.4.register_expires}
+account.4.outbound_host = {$account.4.outbound_proxy}
+account.4.outbound_port = {$account.4.sip_port}
 
 #Server Redundancy
-account.4.sip_server.2.address= {$server_address_4}
-account.4.sip_server.2.port= {$sip_port_4}
-account.4.sip_server.2.transport_type = {if $sip_transport_4 == 'udp'}0{/if}{if $sip_transport_4 == 'tcp'}1{/if}{if $sip_transport_4 == 'tls'}2{/if}{if $sip_transport_4 == 'dns srv'}3{/if}{""}
-account.4.sip_server.2.expires= {$register_expires_4}
+account.4.sip_server.2.address= {$account.4.server.2.address}
+account.4.sip_server.2.port= {$account.4.sip_port}
+account.4.sip_server.2.transport_type = {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}{""}
+account.4.sip_server.2.expires= {$account.4.register_expires}
 account.4.retry_counts = 3
 
 #Basic Proxy Settings
@@ -741,7 +741,7 @@ account.4.anonymous_reject_offcode =
 account.4.sip_listen_port =
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.4.expires = {$register_expires_4}
+account.4.expires = {$account.4.register_expires}
 
 #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
 account.4.100rel_enable = {$yealink_retransmission}
@@ -925,31 +925,31 @@ account.4.sip_trust_ctrl = 1
 #######################################################################################
 
 #Basic Settings
-account.5.enable = {if isset($user_password_5) }1{else}0{/if}{""}
-account.5.label = {$display_name_5}
-account.5.display_name = {$display_name_5}
-account.5.user_name = {$user_id_5}
-account.5.auth_name = {$user_id_5}
-account.5.password = {$user_password_5}
-account.5.sip_server_host = {$server_address_5}
-account.5.sip_server_port = {$sip_port_5}
-account.5.transport = {if $sip_transport_5 == 'udp'}0{/if}{if $sip_transport_5 == 'tcp'}1{/if}{if $sip_transport_5 == 'tls'}2{/if}{if $sip_transport_5 == 'dns srv'}3{/if}{""}
-account.5.expires = {$register_expires_5}
-account.5.outbound_host = {$outbound_proxy_5}
-account.5.outbound_port = {$sip_port_5}
+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}
+account.5.user_name = {$account.5.user_id}
+account.5.auth_name = {$account.5.user_id}
+account.5.password = {$account.5.password}
+account.5.sip_server_host = {$account.5.server_address}
+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}{""}
+account.5.expires = {$account.5.register_expires}
+account.5.outbound_host = {$account.5.outbound_proxy}
+account.5.outbound_port = {$account.5.sip_port}
 
 #Server Redundancy
-account.5.sip_server.2.address= {$server_address_5}
-account.5.sip_server.2.port= {$sip_port_5}
-account.5.sip_server.2.transport_type = {if $sip_transport_5 == 'udp'}0{/if}{if $sip_transport_5 == 'tcp'}1{/if}{if $sip_transport_5 == 'tls'}2{/if}{if $sip_transport_5 == 'dns srv'}3{/if}{""}
-account.5.sip_server.2.expires= {$register_expires_5}
+account.5.sip_server.2.address= {$account.5.server.2.address}
+account.5.sip_server.2.port= {$account.5.sip_port}
+account.5.sip_server.2.transport_type = {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}{""}
+account.5.sip_server.2.expires= {$account.5.register_expires}
 account.5.retry_counts = 3
 
 #Basic Proxy Settings
-account.5.outbound_proxy_enable= {if isset($outbound_proxy_primary_5)}1{else}0{/if}{""}
-account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5}
+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.2.address = {$outbound_proxy_secondary_5}
+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.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
@@ -971,7 +971,7 @@ account.5.anonymous_reject_offcode =
 account.5.sip_listen_port =
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.5.expires = {$register_expires_5}
+account.5.expires = {$account.5.register_expires}
 
 #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
 account.5.100rel_enable = {$yealink_retransmission}
@@ -1174,31 +1174,31 @@ network.internet_port.gateway =
 #######################################################################################
 
 #Basic Settings
-account.6.enable = {if isset($user_password_6) }1{else}0{/if}{""}
-account.6.label = {$display_name_6}
-account.6.display_name = {$display_name_6}
-account.6.user_name = {$user_id_6}
-account.6.auth_name = {$user_id_6}
-account.6.password = {$user_password_6}
-account.6.sip_server_host = {$server_address_6}
-account.6.sip_server_port = {$sip_port_6}
-account.6.transport = {if $sip_transport_6 == 'udp'}0{/if}{if $sip_transport_6 == 'tcp'}1{/if}{if $sip_transport_6 == 'tls'}2{/if}{if $sip_transport_6 == 'dns srv'}3{/if}{""}
-account.6.expires = {$register_expires_6}
-account.6.outbound_host = {$outbound_proxy_6}
-account.6.outbound_port = {$sip_port_6}
+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}
+account.6.user_name = {$account.6.user_id}
+account.6.auth_name = {$account.6.user_id}
+account.6.password = {$account.6.password}
+account.6.sip_server_host = {$account.6.server_address}
+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}{""}
+account.6.expires = {$account.6.register_expires}
+account.6.outbound_host = {$account.6.outbound_proxy}
+account.6.outbound_port = {$account.6.sip_port}
 
 #Server Redundancy
-account.6.sip_server.2.address= {$server_address_6}
-account.6.sip_server.2.port= {$sip_port_6}
-account.6.sip_server.2.transport_type = {if $sip_transport_6 == 'udp'}0{/if}{if $sip_transport_6 == 'tcp'}1{/if}{if $sip_transport_6 == 'tls'}2{/if}{if $sip_transport_6 == 'dns srv'}3{/if}{""}
-account.6.sip_server.2.expires= {$register_expires_6}
+account.6.sip_server.2.address= {$account.6.server.2.address}
+account.6.sip_server.2.port= {$account.6.sip_port}
+account.6.sip_server.2.transport_type = {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}{""}
+account.6.sip_server.2.expires= {$account.6.register_expires}
 account.6.retry_counts = 3
 
 #Basic Proxy Settings
-account.6.outbound_proxy_enable= {if isset($outbound_proxy_primary_6)}1{else}0{/if}{""}
-account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6}
+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.2.address = {$outbound_proxy_secondary_6}
+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.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
@@ -1220,7 +1220,7 @@ account.6.anonymous_reject_offcode =
 account.6.sip_listen_port =
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.6.expires = {$register_expires_6}
+account.6.expires = {$account.6.register_expires}
 
 #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
 account.6.100rel_enable = {$yealink_retransmission}