diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg
index 5a1c8ee9a7..4e72326ab0 100644
--- a/resources/templates/provision/yealink/t41s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg
@@ -13,45 +13,45 @@
 ## ranges from 1 to 6;
 ##account.X.enable =
 
-{if isset($account.{$row.line_number}.password) }
+{if isset($row.password) }
 account.{$row.line_number}.enable = 1
 {else}
 account.{$row.line_number}.enable = 0
 {/if}
-account.{$row.line_number}.label = {$account.{$row.line_number}.label}
-account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name}
-account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id}
-account.{$row.line_number}.password = {$account.{$row.line_number}.password}
-{if isset($account.{$row.line_number}.server.1.address)}
-account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}@{$account.{$row.line_number}.server_address}
+account.{$row.line_number}.label = {$row.label}
+account.{$row.line_number}.display_name = {$row.display_name}
+account.{$row.line_number}.auth_name = {$row.auth_id}
+account.{$row.line_number}.password = {$row.password}
+{if isset($row.server.1.address)}
+account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
 {else}
-account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}
+account.{$row.line_number}.user_name = {$row.user_id}
 {/if}
-account.{$row.line_number}.sip_server_host = {$account.{$row.line_number}.server_address}
-account.{$row.line_number}.sip_server_port = {$account.{$row.line_number}.sip_port}
-account.{$row.line_number}.outbound_host = {$account.{$row.line_number}.outbound_proxy}
-account.{$row.line_number}.outbound_port = {$account.{$row.line_number}.sip_port}
+account.{$row.line_number}.sip_server_host = {$row.server_address}
+account.{$row.line_number}.sip_server_port = {$row.sip_port}
+account.{$row.line_number}.outbound_host = {$row.outbound_proxy}
+account.{$row.line_number}.outbound_port = {$row.sip_port}
 {if isset($yealink_sip_listen_port)}account.{$row.line_number}.sip_listen_port = {$yealink_sip_listen_port}{else}account.{$row.line_number}.sip_listen_port = 5060{/if}
 
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $account.{$row.line_number}.sip_transport == 'udp'}account.{$row.line_number}.transport = 0{/if}
-{if $account.{$row.line_number}.sip_transport == 'tcp'}account.{$row.line_number}.transport = 1{/if}
-{if $account.{$row.line_number}.sip_transport == 'tls'}account.{$row.line_number}.transport = 2{/if}
-{if $account.{$row.line_number}.sip_transport == 'dns srv'}account.{$row.line_number}.transport = 3{/if}
+{if $row.sip_transport == 'udp'}account.{$row.line_number}.transport = 0{/if}
+{if $row.sip_transport == 'tcp'}account.{$row.line_number}.transport = 1{/if}
+{if $row.sip_transport == 'tls'}account.{$row.line_number}.transport = 2{/if}
+{if $row.sip_transport == 'dns srv'}account.{$row.line_number}.transport = 3{/if}
 
-account.{$row.line_number}.outbound_proxy.1.address = {$account.{$row.line_number}.outbound_proxy_primary}
-account.{$row.line_number}.outbound_proxy.2.address = {$account.{$row.line_number}.outbound_proxy_secondary}
-account.{$row.line_number}.outbound_proxy_enable = {if isset($account.{$row.line_number}.outbound_proxy_primary)}1{else}0{/if}
+account.{$row.line_number}.outbound_proxy.1.address = {$row.outbound_proxy_primary}
+account.{$row.line_number}.outbound_proxy.2.address = {$row.outbound_proxy_secondary}
+account.{$row.line_number}.outbound_proxy_enable = {if isset($row.outbound_proxy_primary)}1{else}0{/if}
 
 {if isset($outbound_proxy_1_port)}
 account.{$row.line_number}.outbound_proxy.1.port = {$outbound_proxy_1_port}
 {else}
-account.{$row.line_number}.outbound_proxy.1.port = {$account.{$row.line_number}.sip_port}
+account.{$row.line_number}.outbound_proxy.1.port = {$row.sip_port}
 {/if}
 {if isset($outbound_proxy_1_port)}
 account.{$row.line_number}.outbound_proxy.2.port = {$outbound_proxy_2_port}
 {else}
-account.{$row.line_number}.outbound_proxy.2.port = {$account.{$row.line_number}.sip_port}
+account.{$row.line_number}.outbound_proxy.2.port = {$row.sip_port}
 {/if}
 
 {/foreach}
@@ -69,31 +69,31 @@ account.{$row.line_number}.failback_timeout = 3600
 account.{$row.line_number}.naptr_build = 0
 account.{$row.line_number}.fallback.redundancy_type = 0
 account.{$row.line_number}.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.{$row.line_number}.sip_server.1.address = {$account.{$row.line_number}.server.1.address}
-account.{$row.line_number}.sip_server.1.port = {$account.{$row.line_number}.sip_port}
+account.{$row.line_number}.sip_server.1.address = {$row.server.1.address}
+account.{$row.line_number}.sip_server.1.port = {$row.sip_port}
 
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
-{if $account.{$row.line_number}.sip_transport == 'udp'}account.{$row.line_number}.sip_server.1.transport_type = 0{/if}
-{if $account.{$row.line_number}.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.1.transport_type = 1{/if}
-{if $account.{$row.line_number}.sip_transport == 'tls'}account.{$row.line_number}.sip_server.1.transport_type = 2{/if}
-{if $account.{$row.line_number}.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.1.transport_type = 3{/if}
+{if $row.sip_transport == 'udp'}account.{$row.line_number}.sip_server.1.transport_type = 0{/if}
+{if $row.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.1.transport_type = 1{/if}
+{if $row.sip_transport == 'tls'}account.{$row.line_number}.sip_server.1.transport_type = 2{/if}
+{if $row.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.1.transport_type = 3{/if}
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.{$row.line_number}.sip_server.1.expires = {$account.{$row.line_number}.register_expires}
+account.{$row.line_number}.sip_server.1.expires = {$row.register_expires}
 account.{$row.line_number}.sip_server.1.retry_counts = 3
 account.{$row.line_number}.sip_server.1.failback_mode = 0
 account.{$row.line_number}.sip_server.1.failback_timeout = 3600
 account.{$row.line_number}.sip_server.1.register_on_enable = 0
-account.{$row.line_number}.sip_server.2.address = {$account.{$row.line_number}.server.2.address}
-account.{$row.line_number}.sip_server.2.port = {$account.{$row.line_number}.sip_port}
+account.{$row.line_number}.sip_server.2.address = {$row.server.2.address}
+account.{$row.line_number}.sip_server.2.port = {$row.sip_port}
 
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
-{if $account.{$row.line_number}.sip_transport == 'udp'}account.{$row.line_number}.sip_server.2.transport_type = 0{/if}
-{if $account.{$row.line_number}.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.2.transport_type = 1{/if}
-{if $account.{$row.line_number}.sip_transport == 'tls'}account.{$row.line_number}.sip_server.2.transport_type = 2{/if}
-{if $account.{$row.line_number}.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.2.transport_type = 3{/if}
+{if $row.sip_transport == 'udp'}account.{$row.line_number}.sip_server.2.transport_type = 0{/if}
+{if $row.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.2.transport_type = 1{/if}
+{if $row.sip_transport == 'tls'}account.{$row.line_number}.sip_server.2.transport_type = 2{/if}
+{if $row.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.2.transport_type = 3{/if}
 
-account.{$row.line_number}.sip_server.2.expires = {$account.{$row.line_number}.register_expires}
+account.{$row.line_number}.sip_server.2.expires = {$row.register_expires}
 account.{$row.line_number}.sip_server.2.retry_counts = 3
 account.{$row.line_number}.sip_server.2.failback_mode = 0
 account.{$row.line_number}.sip_server.2.failback_timeout = 3600
@@ -135,7 +135,7 @@ account.{$row.line_number}.unregister_on_reboot =
 account.{$row.line_number}.sip_trust_ctrl = 1
 
 #Configure the timeout (in seconds) for DNS query, the value ranges from 1 to 9, the default value is 8.
-account.{$row.line_number}.dns_query_timeout=
+account.{$row.line_number}.dns_query_timeout =
 
 #Enable or disable the timer to periodically refresh the DNS-SRV query result; 0-Disabled (default), 1-Enabled;
 account.{$row.line_number}.srv_ttl_timer_enable =
@@ -222,8 +222,8 @@ account.{$row.line_number}.out_dialog_blf_enable = 0
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
-{if isset($account.{$row.line_number}.shared_line) }
-account.{$row.line_number}.shared_line = {$account.{$row.line_number}.shared_line}
+{if isset($row.shared_line) }
+account.{$row.line_number}.shared_line = {$row.shared_line}
 {else}
 account.{$row.line_number}.shared_line = 0
 {/if}
@@ -398,7 +398,7 @@ account.{$row.line_number}.picture_info_enable = 1
 account.{$row.line_number}.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.{$row.line_number}.conf_uri = {if $nway_conference == 'true'}nway{$account.{$row.line_number}.auth_id}@{$account.{$row.line_number}.server_address}{/if}
+account.{$row.line_number}.conf_uri = {if $nway_conference == 'true'}nway{$row.auth_id}@{$row.server_address}{/if}
 
 
 #######################################################################################