diff --git a/resources/templates/provision/yealink/w56p/{$mac}.cfg b/resources/templates/provision/yealink/w56p/{$mac}.cfg
index 12e3d24cc5..ed7a4b9510 100644
--- a/resources/templates/provision/yealink/w56p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w56p/{$mac}.cfg
@@ -271,23 +271,23 @@ account.1.sip_trust_ctrl = 1
 account.2.enable = 1
 
 #Configure the label displayed on the LCD screen for account 1.
-account.2.label = {$display_name_2}
+account.2.label = {$account.2.display_name}
 
 #Configure the display name of account 1.
-account.2.display_name = {$display_name_2}
+account.2.display_name = {$account.2.display_name}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
-account.2.password = {$user_password_2}
+account.2.auth_name = {$account.2.user_id}
+account.2.password = {$account.2.password}
 
 #Configure the register user name.
-account.2.user_name = {$user_id_2}
+account.2.user_name = {$account.2.user_id}
 
 #Configure the SIP server address.
-account.2.sip_server_host = {$server_address_2}
+account.2.sip_server_host = {$account.2.server_address}
 
 #Specify the port for the SIP server. The default value is 5060.
-account.2.sip_server_port = {$sip_port_2}
+account.2.sip_server_port = {$account.2.sip_port}
 
 #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled;
 
@@ -296,17 +296,17 @@ account.2.sip_server_port = {$sip_port_2}
 account.2.outbound_host =
 
 #Specify the server port, the default value is 5060.
-account.2.outbound_port =5060
+account.2.outbound_port = {$account.2.sip_port}
 
 #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}
 
 #Configure the address of the backup outbound proxy server.
 account.2.backup_outbound_host =
@@ -333,7 +333,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}
@@ -520,42 +520,42 @@ account.2.sip_trust_ctrl = 1
 account.3.enable = 1
 
 #Configure the label displayed on the LCD screen for account 1.
-account.3.label = {$display_name_3}
+account.3.label = {$account.3.display_name}
 
 #Configure the display name of account 1.
-account.3.display_name = {$display_name_3}
+account.3.display_name = {$account.3.display_name}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
-account.3.password = {$user_password_3}
+account.3.auth_name = {$account.3.user_id}
+account.3.password = {$account.3.password}
 
 #Configure the register user name.
-account.3.user_name = {$user_id_3}
+account.3.user_name = {$account.3.user_id}
 
 #Configure the SIP server address.
-account.3.sip_server_host = {$server_address_3}
+account.3.sip_server_host = {$account.3.server_address}
 
 #Specify the port for the SIP server. The default value is 5060.
-account.3.sip_server_port = {$sip_port_3}
+account.3.sip_server_port = {$account.3.sip_port}
 
 #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled;
 
 
 #Specify the IP address or domain name of the outbound proxy server.
-account.3.outbound_host = {$outbound_proxy_3}
+account.3.outbound_host = {$account.3.outbound_proxy}
 
 #Specify the server port, the default value is 5060.
-account.3.outbound_port = 5060
+account.3.outbound_port = {$account.3.sip_port}
 
 #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}
 
 #Configure the address of the backup outbound proxy server.
 account.3.backup_outbound_host =
@@ -582,7 +582,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}
@@ -785,7 +785,7 @@ account.4.user_name =
 account.4.sip_server_host =
 
 #Specify the port for the SIP server. The default value is 5060.
-account.4.sip_server_port = {$sip_port_4}
+account.4.sip_server_port = {$account.4.sip_port}
 
 #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled;
 
@@ -797,14 +797,14 @@ account.4.outbound_host =
 account.4.outbound_port =
 
 #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}
 
 
 #Configure the address of the backup outbound proxy server.
@@ -832,7 +832,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}
@@ -1036,7 +1036,7 @@ account.5.user_name =
 account.5.sip_server_host =
 
 #Specify the port for the SIP server. The default value is 5060.
-account.5.sip_server_port = {$sip_port_5}
+account.5.sip_server_port = {$account.5.sip_port}
 
 #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled;
 
@@ -1048,14 +1048,14 @@ account.5.outbound_host =
 account.5.outbound_port =
 
 #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}
 
 #Configure the address of the backup outbound proxy server.
 account.5.backup_outbound_host =
@@ -1082,7 +1082,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}