diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg
index 8a52b18e34..0653200c7f 100644
--- a/resources/templates/provision/yealink/t52s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg
@@ -195,39 +195,39 @@ account.2.codec.g722.enable=
 ################################################################
 #                      Account Register                       ##
 ################################################################
-{if isset($user_password_1) }
+{if isset($account.1.user_password) }
 account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$display_name_1}
-account.1.display_name = {$display_name_1}
-account.1.auth_name = {$auth_id_1}
-account.1.password = {$user_password_1}
-account.1.user_name = {$user_id_1}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.auth_name = {$account.1.auth_id}
+account.1.password = {$account.1.user_password}
+account.1.user_name = {$account.1.user_id}
 
-account.1.sip_server.1.address= {$server_address_1}
-account.1.sip_server.1.port= {$sip_port_1}
+account.1.sip_server.1.address= {$account.1.server.1.address}
+account.1.sip_server.1.port= {$account.1.sip_port}
 
 
-{if $sip_transport_1 == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
 
-account.1.sip_server.1.expires= {$register_expires_1}
+account.1.sip_server.1.expires= {$account.1.register_expires}
 account.1.sip_server.1.retry_counts= 3
 
-account.1.sip_server.2.address= {$server_address_2}
-account.1.sip_server.2.port= {$sip_port_2}
+account.1.sip_server.2.address= {$account.1.server.2.address}
+account.1.sip_server.2.port= {$account.1.sip_port}
 
 
-{if $sip_transport_1 == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
 
-account.1.sip_server.2.expires= {$register_expires_2}
+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}
@@ -237,7 +237,7 @@ account.1.outbound_proxy.1.address= {$outbound_proxy_primary_1}
 {if isset($outbound_proxy_1_port)}
 account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
 {else}
-account.1.outbound_proxy.1.port = 5060
+account.1.outbound_proxy.1.port = {$account.1.sip_port}
 {/if}
 
 account.1.outbound_proxy.2.address= {$outbound_proxy_secondary_1}
@@ -245,7 +245,7 @@ account.1.outbound_proxy.2.address= {$outbound_proxy_secondary_1}
 {if isset($outbound_proxy_1_port)}
 account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
 {else}
-account.1.outbound_proxy.2.port = 5060
+account.1.outbound_proxy.2.port = {$account.1.sip_port}
 {/if}
 
 {if isset($outbound_proxy_fallback_interval)}