diff --git a/resources/templates/provision/yealink/t5x/{$mac}.cfg b/resources/templates/provision/yealink/t5x/{$mac}.cfg
index c6ac3321d6..a828d1db88 100644
--- a/resources/templates/provision/yealink/t5x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t5x/{$mac}.cfg
@@ -5,44 +5,45 @@
 
 {foreach $lines as $row}
 #######################################################################################
-##                           Account {$row.line_number} Basic Settings                                ##
+##                          Account {$row.line_number} Basic Settings    						 ##
 #######################################################################################
 ## ranges from 1 to 16
 ##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}.display_name}
-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}
-account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}
-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_listen_port = {$account.{$row.line_number}.sip_port}
+account.{$row.line_number}.label = {$row.display_name}
+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}
+account.{$row.line_number}.user_name = {$row.user_id}
+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}
+account.{$row.line_number}.sip_listen_port = {$row.sip_port}
 #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}
 
-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}
 
 #######################################################################################
@@ -57,17 +58,17 @@ 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 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.expires = {$account.{$row.line_number}.register_expires}
+account.{$row.line_number}.sip_server.2.address = {$row.server.2.address}
+account.{$row.line_number}.sip_server.2.port = {$row.sip_port}
+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
@@ -123,7 +124,6 @@ account.{$row.line_number}.reg_fail_retry_interval =
 #########################################################################
 ##                     NAT Settings                                    ##
 #########################################################################
-
 #Enable or disable the NAT traversal 0-Disabled (default), 1-STUN
 account.{$row.line_number}.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
 
@@ -186,8 +186,8 @@ account.{$row.line_number}.out_dialog_blf_enable = 0
 ## ranges from 1 to 16
 
 #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}
@@ -199,7 +199,7 @@ account.{$row.line_number}.bla_subscribe_period = 300
 #######################################################################################
 ##                            Audio Codec                                            ##
 #######################################################################################
-#Audio codecs for account1 (Y ranges from 1 to 11).
+#Audio codecs for account (Y ranges from 1 to 11).
 
 account.{$row.line_number}.codec.1.enable = {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
 account.{$row.line_number}.codec.1.payload_type = PCMU
@@ -328,7 +328,7 @@ account.{$row.line_number}.picture_info_enable = 1
 account.{$row.line_number}.conf_type = {if $nway_conference == true}2{/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}.user_id}@{$account.{$row.line_number}.server_address}{/if}
+account.{$row.line_number}.conf_uri = {if $nway_conference == true}nway{$row.user_id}@{$row.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -492,7 +492,6 @@ network.internet_port.gateway =
 #######################################################################################
 ##                             Line Key                                              ##
 #######################################################################################
-
 #The x of the parameter "linekey.x.line" ranges from 1 to 6.
 #The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1.
 #linekey.x.lable--Define the label for each line key. Meet-Me Conference "1" or BLF "16" require pick_value.
@@ -537,4 +536,4 @@ expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label}
 expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook =
 {/if}
 {$rownum = $rownum + 1}
-{/foreach}
\ No newline at end of file
+{/foreach}