diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index ff12fa62eb..0cebe8218e 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -485,33 +485,33 @@ account.1.xsi.port =
 #######################################################################################
 ## ranges from 1 to 6;
 ##account.X.enable =
-{if isset($user_password_2) }
+{if isset($account.2.password) }
 account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$display_name_2}
-account.2.display_name = {$display_name_2}
-account.2.auth_name = {$auth_id_2}
-account.2.password = {$user_password_2}
-account.2.user_name = {$user_id_2}
-account.2.sip_server_host = {$server_address_2}
-account.2.sip_server_port = {$sip_port_2}
-account.2.outbound_host = {$outbound_proxy_2}
+account.2.label = {$account.2.display_name}
+account.2.display_name = {$account.2.display_name}
+account.2.auth_name = {$account.2.auth_id}
+account.2.password = {$account.2.password}
+account.2.user_name = {$account.2.user_id}
+account.2.sip_server_host = {$account.2.server_address}
+account.2.sip_server_port = {$account.2.sip_port}
+account.2.outbound_host = {$account.2.outbound_proxy}
 
-account.2.outbound_port = {$sip_port_2}
+account.2.outbound_port = {$account.2.sip_port}
 {if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if}
 
 account.2.sip_listen_port = 5060
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $sip_transport_2 == 'udp'}account.2.transport = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if}
-{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if}
+{if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.transport = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.transport = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.transport = 3{/if}
 
-account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2}
-account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2}
-account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if}
+account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
+account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
+account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
 
 #######################################################################################
 ##                          Failback                                                 ##
@@ -526,17 +526,17 @@ account.2.failback_timeout = 3600
 account.2.naptr_build = 0
 account.2.fallback.redundancy_type = 0
 account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.2.sip_server.1.address =
-account.2.sip_server.1.port = 5060
+account.2.sip_server.1.address = {$account.2.server.1.address}
+account.2.sip_server.1.port = {$account.2.sip_port}
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.2.sip_server.1.expires = {$register_expires_2}
+account.2.sip_server.1.expires = {$account.2.register_expires}
 account.2.sip_server.1.retry_counts = 3
 account.2.sip_server.1.failback_mode = 0
 account.2.sip_server.1.failback_timeout = 3600
 account.2.sip_server.1.register_on_enable = 0
-account.2.sip_server.2.address =
-account.2.sip_server.2.port = 5060
-account.2.sip_server.2.expires = 3600
+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.expires = {$account.2.register_expires}
 account.2.sip_server.2.retry_counts = 3
 account.2.sip_server.2.failback_mode = 0
 account.2.sip_server.2.failback_timeout = 3600
@@ -669,8 +669,8 @@ account.2.out_dialog_blf_enable = 0
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
-{if isset($shared_line_2) }
-account.2.shared_line = {$shared_line_2}
+{if isset($account.2.shared_line) }
+account.2.shared_line = {$account.2.shared_line}
 {else}
 account.2.shared_line = 0
 {/if}
@@ -967,33 +967,33 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 #######################################################################################
 ## ranges from 1 to 6;
 ##account.X.enable =
-{if isset($user_password_3) }
+{if isset($account.3.password) }
 account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$display_name_3}
-account.3.display_name = {$display_name_3}
-account.3.auth_name = {$auth_id_3}
-account.3.password = {$user_password_3}
-account.3.user_name = {$user_id_3}
-account.3.sip_server_host = {$server_address_3}
-account.3.sip_server_port = {$sip_port_3}
-account.3.outbound_host = {$outbound_proxy_3}
+account.3.label = {$account.3.display_name}
+account.3.display_name = {$account.3.display_name}
+account.3.auth_name = {$account.3.auth_id}
+account.3.password = {$account.3.password}
+account.3.user_name = {$account.3.user_id}
+account.3.sip_server_host = {$account.3.server_address}
+account.3.sip_server_port = {$account.3.sip_port}
+account.3.outbound_host = {$account.3.outbound_proxy}
 
-account.3.outbound_port = {$sip_port_3}
+account.3.outbound_port = {$account.3.sip_port}
 {if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if}
 
 account.3.sip_listen_port = 5060
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $sip_transport_3 == 'udp'}account.3.transport = 0{/if}
-{if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if}
-{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if}
-{if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if}
+{if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.transport = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.transport = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.transport = 3{/if}
 
-account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3}
-account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3}
-account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if}
+account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
+account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
+account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
 
 #######################################################################################
 ##                          Failback                                                 ##
@@ -1008,17 +1008,17 @@ account.3.failback_timeout = 3600
 account.3.naptr_build = 0
 account.3.fallback.redundancy_type = 0
 account.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.3.sip_server.1.address =
-account.3.sip_server.1.port = 5060
+account.3.sip_server.1.address = {$account.3.server.1.address}
+account.3.sip_server.1.port = {$account.3.sip_port}
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.3.sip_server.1.expires = {$register_expires_3}
+account.3.sip_server.1.expires = {$account.3.register_expires}
 account.3.sip_server.1.retry_counts = 3
 account.3.sip_server.1.failback_mode = 0
 account.3.sip_server.1.failback_timeout = 3600
 account.3.sip_server.1.register_on_enable = 0
-account.3.sip_server.2.address =
-account.3.sip_server.2.port = 5060
-account.3.sip_server.2.expires = 3600
+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.expires = {$account.3.register_expires}
 account.3.sip_server.2.retry_counts = 3
 account.3.sip_server.2.failback_mode = 0
 account.3.sip_server.2.failback_timeout = 3600
@@ -1151,8 +1151,8 @@ account.3.out_dialog_blf_enable = 0
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
-{if isset($shared_line_3) }
-account.3.shared_line = {$shared_line_3}
+{if isset($account.3.shared_line) }
+account.3.shared_line = {$account.3.shared_line}
 {else}
 account.3.shared_line = 0
 {/if}
@@ -1439,33 +1439,33 @@ account.3.xsi.port =
 #######################################################################################
 ## ranges from 1 to 6;
 ##account.X.enable =
-{if isset($user_password_4) }
+{if isset($account.4.password) }
 account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$display_name_4}
-account.4.display_name = {$display_name_4}
-account.4.auth_name = {$auth_id_4}
-account.4.password = {$user_password_4}
-account.4.user_name = {$user_id_4}
-account.4.sip_server_host = {$server_address_4}
-account.4.sip_server_port = {$sip_port_4}
-account.4.outbound_host = {$outbound_proxy_4}
+account.4.label = {$account.4.display_name}
+account.4.display_name = {$account.4.display_name}
+account.4.auth_name = {$account.4.auth_id}
+account.4.password = {$account.4.password}
+account.4.user_name = {$account.4.user_id}
+account.4.sip_server_host = {$account.4.server_address}
+account.4.sip_server_port = {$account.4.sip_port}
+account.4.outbound_host = {$account.4.outbound_proxy}
 
-account.4.outbound_port = {$sip_port_4}
+account.4.outbound_port = {$account.4.sip_port}
 {if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if}
 
 account.4.sip_listen_port = 5060
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $sip_transport_4 == 'udp'}account.4.transport = 0{/if}
-{if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if}
-{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if}
-{if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if}
+{if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.transport = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.transport = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.transport = 3{/if}
 
-account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4}
-account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4}
-account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if}
+account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
 
 #######################################################################################
 ##                          Failback                                                 ##
@@ -1480,17 +1480,17 @@ account.4.failback_timeout = 3600
 account.4.naptr_build = 0
 account.4.fallback.redundancy_type = 0
 account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.4.sip_server.1.address =
-account.4.sip_server.1.port = 5060
+account.4.sip_server.1.address = {$account.4.server.1.address}
+account.4.sip_server.1.port = {$account.4.sip_port}
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.4.sip_server.1.expires = {$register_expires_4}
+account.4.sip_server.1.expires = {$account.4.register_expires}
 account.4.sip_server.1.retry_counts = 3
 account.4.sip_server.1.failback_mode = 0
 account.4.sip_server.1.failback_timeout = 3600
 account.4.sip_server.1.register_on_enable = 0
-account.4.sip_server.2.address =
-account.4.sip_server.2.port = 5060
-account.4.sip_server.2.expires = 3600
+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.expires = {$account.4.register_expires}
 account.4.sip_server.2.retry_counts = 3
 account.4.sip_server.2.failback_mode = 0
 account.4.sip_server.2.failback_timeout = 3600
@@ -1623,8 +1623,8 @@ account.4.out_dialog_blf_enable = 0
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
-{if isset($shared_line_4) }
-account.4.shared_line = {$shared_line_4}
+{if isset($account.4.shared_line) }
+account.4.shared_line = {$account.4.shared_line}
 {else}
 account.4.shared_line = 0
 {/if}
@@ -1911,33 +1911,33 @@ account.4.xsi.port =
 #######################################################################################
 ## ranges from 1 to 6;
 ##account.X.enable =
-{if isset($user_password_5) }
+{if isset($account.5.password) }
 account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$display_name_5}
-account.5.display_name = {$display_name_5}
-account.5.auth_name = {$auth_id_5}
-account.5.password = {$user_password_5}
-account.5.user_name = {$user_id_5}
-account.5.sip_server_host = {$server_address_5}
-account.5.sip_server_port = {$sip_port_5}
-account.5.outbound_host = {$outbound_proxy_5}
+account.5.label = {$account.5.display_name}
+account.5.display_name = {$account.5.display_name}
+account.5.auth_name = {$account.5.auth_id}
+account.5.password = {$account.5.password}
+account.5.user_name = {$account.5.user_id}
+account.5.sip_server_host = {$account.5.server_address}
+account.5.sip_server_port = {$account.5.sip_port}
+account.5.outbound_host = {$account.5.outbound_proxy}
 
-account.5.outbound_port = {$sip_port_5}
+account.5.outbound_port = {$account.5.sip_port}
 {if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if}
 
 account.5.sip_listen_port = 5060
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $sip_transport_5 == 'udp'}account.5.transport = 0{/if}
-{if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if}
-{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if}
-{if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if}
+{if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.transport = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.transport = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.transport = 3{/if}
 
-account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5}
-account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5}
-account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if}
+account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
+account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
+account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
 
 #######################################################################################
 ##                          Failback                                                 ##
@@ -1952,17 +1952,17 @@ account.5.failback_timeout = 3600
 account.5.naptr_build = 0
 account.5.fallback.redundancy_type = 0
 account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.5.sip_server.1.address =
-account.5.sip_server.1.port = 5060
+account.5.sip_server.1.address = {$account.5.server.1.address}
+account.5.sip_server.1.port = {$account.5.sip_port}
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.5.sip_server.1.expires = {$register_expires_5}
+account.5.sip_server.1.expires = {$account.5.register_expires}
 account.5.sip_server.1.retry_counts = 3
 account.5.sip_server.1.failback_mode = 0
 account.5.sip_server.1.failback_timeout = 3600
 account.5.sip_server.1.register_on_enable = 0
-account.5.sip_server.2.address =
-account.5.sip_server.2.port = 5060
-account.5.sip_server.2.expires = 3600
+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.expires = {$account.5.register_expires}
 account.5.sip_server.2.retry_counts = 3
 account.5.sip_server.2.failback_mode = 0
 account.5.sip_server.2.failback_timeout = 3600
@@ -2095,8 +2095,8 @@ account.5.out_dialog_blf_enable = 0
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
-{if isset($shared_line_5) }
-account.5.shared_line = {$shared_line_5}
+{if isset($account.5.shared_line) }
+account.5.shared_line = {$account.5.shared_line}
 {else}
 account.5.shared_line = 0
 {/if}
@@ -2383,33 +2383,33 @@ account.5.xsi.port =
 #######################################################################################
 ## ranges from 1 to 6;
 ##account.X.enable =
-{if isset($user_password_6) }
+{if isset($account.6.password) }
 account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$display_name_6}
-account.6.display_name = {$display_name_6}
-account.6.auth_name = {$auth_id_6}
-account.6.password = {$user_password_6}
-account.6.user_name = {$user_id_6}
-account.6.sip_server_host = {$server_address_6}
-account.6.sip_server_port = {$sip_port_6}
-account.6.outbound_host = {$outbound_proxy_6}
+account.6.label = {$account.6.display_name}
+account.6.display_name = {$account.6.display_name}
+account.6.auth_name = {$account.6.auth_id}
+account.6.password = {$account.6.password}
+account.6.user_name = {$account.6.user_id}
+account.6.sip_server_host = {$account.6.server_address}
+account.6.sip_server_port = {$account.6.sip_port}
+account.6.outbound_host = {$account.6.outbound_proxy}
 
-account.6.outbound_port = {$sip_port_6}
+account.6.outbound_port = {$account.6.sip_port}
 {if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if}
 
 account.6.sip_listen_port = 5060
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $sip_transport_6 == 'udp'}account.6.transport = 0{/if}
-{if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if}
-{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if}
-{if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if}
+{if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.transport = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.transport = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.transport = 3{/if}
 
-account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6}
-account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6}
-account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if}
+account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}
+account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
+account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
 
 #######################################################################################
 ##                          Failback                                                 ##
@@ -2424,17 +2424,17 @@ account.6.failback_timeout = 3600
 account.6.naptr_build = 0
 account.6.fallback.redundancy_type = 0
 account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.6.sip_server.1.address =
-account.6.sip_server.1.port = 5060
+account.6.sip_server.1.address = {$account.6.server.1.address}
+account.6.sip_server.1.port = {$account.6.sip_port}
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.6.sip_server.1.expires = {$register_expires_6}
+account.6.sip_server.1.expires = {$account.6.register_expires}
 account.6.sip_server.1.retry_counts = 3
 account.6.sip_server.1.failback_mode = 0
 account.6.sip_server.1.failback_timeout = 3600
 account.6.sip_server.1.register_on_enable = 0
-account.6.sip_server.2.address =
-account.6.sip_server.2.port = 5060
-account.6.sip_server.2.expires = 3600
+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.expires = {$account.6.register_expires}
 account.6.sip_server.2.retry_counts = 3
 account.6.sip_server.2.failback_mode = 0
 account.6.sip_server.2.failback_timeout = 3600
@@ -2566,8 +2566,8 @@ account.6.out_dialog_blf_enable = 0
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
-{if isset($shared_line_6) }
-account.6.shared_line = {$shared_line_6}
+{if isset($account.6.shared_line) }
+account.6.shared_line = {$account.6.shared_line}
 {else}
 account.6.shared_line = 0
 {/if}