diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index 2f3f5624ed..4abb4a5bdf 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -9,6 +9,7 @@
 
 #Basic Settings
 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}
 account.1.user_name = {$account.1.user_id}
@@ -17,6 +18,7 @@ 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}{""}
+
 account.1.expires = {$account.1.register_expires}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
@@ -25,14 +27,18 @@ account.1.outbound_port = {$account.1.sip_port}
 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 $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($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($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($account.1.sip_port)}{$account.1.sip_port}{else}5060{/if}{""}
 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
@@ -236,6 +242,7 @@ account.1.sip_trust_ctrl = 1
 
 #Basic Settings
 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}
@@ -244,6 +251,7 @@ 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}
@@ -252,15 +260,19 @@ account.2.outbound_port = {$account.2.sip_port}
 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($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($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($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;
@@ -466,6 +478,7 @@ account.2.sip_trust_ctrl = 1
 
 #Basic Settings
 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}
@@ -474,6 +487,7 @@ 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}
@@ -482,16 +496,20 @@ account.3.outbound_port = {$sip_port}
 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 $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($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($account.3.sip_port)}{$account.3.sip_port}{else}5060{/if}{""}
-account.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+a
+ccount.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
 account.3.anonymous_call =
@@ -696,6 +714,7 @@ account.3.sip_trust_ctrl = 1
 
 #Basic Settings
 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}
@@ -704,6 +723,7 @@ 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}
@@ -712,15 +732,19 @@ account.4.outbound_port = {$account.4.sip_port}
 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
 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;
@@ -926,6 +950,7 @@ account.4.sip_trust_ctrl = 1
 
 #Basic Settings
 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}
@@ -934,6 +959,7 @@ 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}
@@ -942,15 +968,19 @@ account.5.outbound_port = {$account.5.sip_port}
 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($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($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($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;
@@ -1166,7 +1196,9 @@ network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
 {if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
 {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}{""}
 
 #######################################################################################
@@ -1175,6 +1207,7 @@ network.internet_port.gateway =
 
 #Basic Settings
 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}
@@ -1183,7 +1216,8 @@ 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}
+a
+ccount.6.expires = {$account.6.register_expires}
 account.6.outbound_host = {$account.6.outbound_proxy}
 account.6.outbound_port = {$account.6.sip_port}
 
@@ -1191,15 +1225,19 @@ account.6.outbound_port = {$account.6.sip_port}
 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($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($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($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;
@@ -1415,7 +1453,9 @@ network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
 {if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
 {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}{""}
 
 #######################################################################################
@@ -1424,6 +1464,7 @@ network.internet_port.gateway =
 
 #Basic Settings
 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}
@@ -1432,6 +1473,7 @@ 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}
@@ -1440,15 +1482,19 @@ account.7.outbound_port = {$account.7.sip_port}
 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($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;
@@ -1664,7 +1710,9 @@ network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
 {if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
 {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}{""}
 
 #######################################################################################
@@ -1673,6 +1721,7 @@ network.internet_port.gateway =
 
 #Basic Settings
 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}
@@ -1681,6 +1730,7 @@ 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}
@@ -1689,15 +1739,19 @@ account.8.outbound_port = {$account.8.sip_port}
 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($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;
@@ -1913,5 +1967,7 @@ network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
 {if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
 {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}{""}