diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg
index 8e4dd42cc6..9e5ad54bc6 100644
--- a/resources/templates/provision/yealink/t52s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg
@@ -230,9 +230,9 @@ account.1.sip_server.2.port= {$account.1.sip_port}
 account.1.sip_server.2.expires= {$account.1.register_expires}
 account.1.sip_server.2.retry_counts= 3
 
-account.1.outbound_proxy_enable= {if isset($outbound_proxy_primary_1)}1{else}0{/if}
+account.1.outbound_proxy_enable= {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
 
-account.1.outbound_proxy.1.address= {$outbound_proxy_primary_1}
+account.1.outbound_proxy.1.address= {$account.1.outbound_proxy_primary}
 
 {if isset($outbound_proxy_1_port)}
 account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
@@ -240,7 +240,7 @@ account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
 account.1.outbound_proxy.1.port = {$account.1.sip_port}
 {/if}
 
-account.1.outbound_proxy.2.address= {$outbound_proxy_secondary_1}
+account.1.outbound_proxy.2.address= {$account.1.outbound_proxy_secondary}
 
 {if isset($outbound_proxy_1_port)}
 account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
@@ -257,57 +257,57 @@ account.1.outbound_proxy_fallback_interval = 120
 account.1.nat.nat_traversal=
 
 
-{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.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.1.address= {$server_address_2}
-account.2.sip_server.1.port= {$sip_port_2}
+account.2.sip_server.1.address= {$account.2.server_address}
+account.2.sip_server.1.port= {$account.2.sip_port}
 
 
-{if $sip_transport_1 == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
 
-account.2.sip_server.1.expires= {$register_expires_1}
+account.2.sip_server.1.expires= {$account.2.register_expires}
 account.2.sip_server.1.retry_counts= 3
 
-account.2.sip_server.2.address= {$server_address_2}
+account.2.sip_server.2.address= {$account.2.server.2.address}
 account.2.sip_server.2.port= {$sip_port_2}
 
 
-{if $sip_transport_2 == 'udp'}account.2.sip_server.2.transport_type = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.2.sip_server.2.transport_type = 1{/if}
-{if $sip_transport_2 == 'tls'}account.2.sip_server.2.transport_type = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if}
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.2.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.2.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.2.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if}
 
-account.2.sip_server.2.expires= {$register_expires_2}
+account.2.sip_server.2.expires= {$account.2.register_expires}
 account.2.sip_server.2.retry_counts= 3
 
-account.2.outbound_proxy_enable= {if isset($outbound_proxy_primary_2)}1{else}0{/if}
+account.2.outbound_proxy_enable= {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
 
-account.2.outbound_proxy.1.address= {$outbound_proxy_primary_2}
+account.2.outbound_proxy.1.address= {$account.2.outbound_proxy_primary}
 
 {if isset($outbound_proxy_1_port)}
 account.2.outbound_proxy.1.port = {$outbound_proxy_2_port}
 {else}
-account.2.outbound_proxy.1.port = 5060
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
 {/if}
 
-account.2.outbound_proxy.2.address= {$outbound_proxy_secondary_2}
+account.2.outbound_proxy.2.address= {$account.2.outbound_proxy_secondary}
 
 {if isset($outbound_proxy_1_port)}
 account.2.outbound_proxy.2.port = {$outbound_proxy_2_port}
 {else}
-account.2.outbound_proxy.2.port = 5060
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
 {/if}
 
 {if isset($outbound_proxy_fallback_interval)}