diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index 10327cff2d..3c49222d7c 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -483,40 +483,40 @@ account.1.xsi.port =
 #######################################################################################
 ##                           Account2 Basic Settings                                 ##
 #######################################################################################
-{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.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if}
+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.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.port = 5060
+account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
 account.2.dial_tone =
-account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2}
-account.2.outbound_proxy.2.port = 5060
+account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
 account.2.outbound_proxy_fallback_interval =
 
 ##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0.
 
-{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}
 
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
 
-{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}
 
 
 #######################################################################################
@@ -526,25 +526,16 @@ account.2.outbound_proxy_fallback_interval =
 account.2.naptr_build = 0
 account.2.fallback.redundancy_type = 0
 account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.2.sip_server.1.address = {$server_address_2}
-{if $sip_transport_1 == 'dns srv'}
-account.2.sip_server.1.port = 0
-{else}
-account.2.sip_server.1.port = {$sip_port_1}
-{/if} 
-account.2.sip_server.1.expires = {$register_expires_1}
+account.2.sip_server.1.address = {$account.2.server.1.address}
+account.2.sip_server.1.port = {$account.2.sip_port}
+account.2.sip_server.1.expires = {$account.2.register_expires}
 account.2.sip_server.1.retry_counts = 3
 account.2.sip_server.1.failback_mode = 0
 account.2.sip_server.1.failback_timeout = 3600
 account.2.sip_server.1.register_on_enable = 0
-
-account.2.sip_server.2.address =
-{if $sip_transport_2 == 'dns srv'}
-account.2.sip_server.2.port = 0
-{else}
-account.2.sip_server.2.port = {$sip_port_2}
-{/if} 
-account.2.sip_server.2.expires = {$register_expires_2}
+account.2.sip_server.2.address = {$account.2.server.2.address}
+account.2.sip_server.2.port = {$account.2.sip_port}
+account.2.sip_server.2.expires = {$account.2.register_expires}
 account.2.sip_server.2.retry_counts = 3
 account.2.sip_server.2.failback_mode = 0
 account.2.sip_server.2.failback_timeout = 3600
@@ -663,7 +654,7 @@ account.2.blf.match_host.enable=
 #######################################################################################
 ##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
 ##The default value is 0.
-account.2.shared_line = {$shared_line_2}
+account.2.shared_line = {$account.2.shared_line}
 ##It configures the BLA number for account X.
 ##The default value is blank.
 account.2.bla_number = 
@@ -942,41 +933,41 @@ account.2.xsi.port =
 #######################################################################################
 ##                           Account3 Basic Settings                                 ##
 #######################################################################################
-{if isset($user_password_3) }
+{if isset($account.3.password) }
 account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$display_name_3}
-account.3.display_name = {$display_name_3}
-account.3.auth_name = {$auth_id_3}
-account.3.password = {$user_password_3}
-account.3.user_name = {$user_id_3} 
-account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if}
+account.3.label = {$account.3.display_name}
+account.3.display_name = {$account.3.display_name}
+account.3.auth_name = {$account.3.auth_id}
+account.3.password = {$account.3.password}
+account.3.user_name = {$account.3.user_id} 
+account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
 
-account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3}
-account.3.outbound_proxy.1.port = 5060
+account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
+account.3.outbound_proxy.1.port = {$account.3.sip_port}
 account.3.dial_tone =
-account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3}
-account.3.outbound_proxy.2.port = 5060
+account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
+account.3.outbound_proxy.2.port = {$account.3.sip_port}
 account.3.outbound_proxy_fallback_interval =
 
 ##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0.
 
-{if $sip_transport_1 == 'udp'}account.3.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.3.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.3.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if}
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.1.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.1.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.1.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if}
 
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
 
 
-{if $sip_transport_2 == 'udp'}account.3.sip_server.2.transport_type = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.3.sip_server.2.transport_type = 1{/if}
-{if $sip_transport_2 == 'tls'}account.3.sip_server.2.transport_type = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if}
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.2.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.2.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.2.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if}
 
 
 #######################################################################################
@@ -986,25 +977,16 @@ account.3.outbound_proxy_fallback_interval =
 account.3.naptr_build = 0
 account.3.fallback.redundancy_type = 0
 account.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.3.sip_server.1.address = {$server_address_3}
-{if $sip_transport_1 == 'dns srv'}
-account.3.sip_server.1.port = 0
-{else}
-account.3.sip_server.1.port = {$sip_port_1}
-{/if} 
-account.3.sip_server.1.expires = {$register_expires_1}
+account.3.sip_server.1.address = {$account.3.server.1.address}
+account.3.sip_server.1.port = {$account.3.sip_port}
+account.3.sip_server.1.expires = {$account.3.register_expires}
 account.3.sip_server.1.retry_counts = 3
 account.3.sip_server.1.failback_mode = 0
 account.3.sip_server.1.failback_timeout = 3600
 account.3.sip_server.1.register_on_enable = 0
-
-account.3.sip_server.2.address =
-{if $sip_transport_2 == 'dns srv'}
-account.3.sip_server.2.port = 0
-{else}
-account.3.sip_server.2.port = {$sip_port_2}
-{/if} 
-account.3.sip_server.2.expires = {$register_expires_2}
+account.3.sip_server.2.address = {$account.3.server.1.address}
+account.3.sip_server.2.port = {$account.3.sip_port}
+account.3.sip_server.2.expires = {$account.3.register_expires}
 account.3.sip_server.2.retry_counts = 3
 account.3.sip_server.2.failback_mode = 0
 account.3.sip_server.2.failback_timeout = 3600
@@ -1123,7 +1105,7 @@ account.3.blf.match_host.enable=
 #######################################################################################
 ##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
 ##The default value is 0.
-account.3.shared_line = {$shared_line_3}
+account.3.shared_line = {$account.3.shared_line}
 ##It configures the BLA number for account X.
 ##The default value is blank.
 account.3.bla_number = 
@@ -1402,40 +1384,40 @@ account.3.xsi.port =
 #######################################################################################
 ##                           Account4 Basic Settings                                 ##
 #######################################################################################
-{if isset($user_password_4) }
+{if isset($account.4.password) }
 account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$display_name_4}
-account.4.display_name = {$display_name_4}
-account.4.auth_name = {$auth_id_4}
-account.4.password = {$user_password_4}
-account.4.user_name = {$user_id_4} 
-account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if}
+account.4.label = {$account.4.display_name}
+account.4.display_name = {$account.4.display_name}
+account.4.auth_name = {$account.4.auth_id}
+account.4.password = {$account.4.password}
+account.4.user_name = {$account.4.user_id} 
+account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
 
-account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4}
-account.4.outbound_proxy.1.port = 5060
+account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
+account.4.outbound_proxy.1.port = {$account.4.sip_port}
 account.4.dial_tone =
-account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4}
-account.4.outbound_proxy.2.port = 5060
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+account.4.outbound_proxy.2.port = {$account.4.sip_port}
 account.4.outbound_proxy_fallback_interval =
 
 ##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0.
 
-{if $sip_transport_1 == 'udp'}account.4.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.4.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.4.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if}
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.1.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.1.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.1.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if}
 
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
 
-{if $sip_transport_2 == 'udp'}account.4.sip_server.2.transport_type = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.4.sip_server.2.transport_type = 1{/if}
-{if $sip_transport_2 == 'tls'}account.4.sip_server.2.transport_type = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if}
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.2.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.2.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.2.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if}
 
 
 #######################################################################################
@@ -1445,25 +1427,16 @@ account.4.outbound_proxy_fallback_interval =
 account.4.naptr_build = 0
 account.4.fallback.redundancy_type = 0
 account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.4.sip_server.1.address = {$server_address_4}
-{if $sip_transport_1 == 'dns srv'}
-account.4.sip_server.1.port = 0
-{else}
-account.4.sip_server.1.port = {$sip_port_1}
-{/if} 
-account.4.sip_server.1.expires = {$register_expires_1}
+account.4.sip_server.1.address = {$account.4.server.1.address}
+account.4.sip_server.1.port = {$account.4.sip_port}
+account.4.sip_server.1.expires = {$account.4.register_expires}
 account.4.sip_server.1.retry_counts = 3
 account.4.sip_server.1.failback_mode = 0
 account.4.sip_server.1.failback_timeout = 3600
 account.4.sip_server.1.register_on_enable = 0
-
-account.4.sip_server.2.address =
-{if $sip_transport_2 == 'dns srv'}
-account.4.sip_server.2.port = 0
-{else}
-account.4.sip_server.2.port = {$sip_port_2}
-{/if} 
-account.4.sip_server.2.expires = {$register_expires_2}
+account.4.sip_server.2.address = {$account.4.server.2.address}
+account.4.sip_server.2.port = {$account.4.sip_port}
+account.4.sip_server.2.expires = {$account.4.register_expires}
 account.4.sip_server.2.retry_counts = 3
 account.4.sip_server.2.failback_mode = 0
 account.4.sip_server.2.failback_timeout = 3600
@@ -1587,7 +1560,7 @@ account.4.blf.match_host.enable=
 #######################################################################################
 ##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
 ##The default value is 0.
-account.4.shared_line = {$shared_line_4}
+account.4.shared_line = {$account.4.shared_line}
 ##It configures the BLA number for account X.
 ##The default value is blank.
 account.4.bla_number = 
@@ -1867,40 +1840,40 @@ account.4.xsi.port =
 #######################################################################################
 ##                           Account5 Basic Settings                                 ##
 #######################################################################################
-{if isset($user_password_5) }
+{if isset($account.5.password) }
 account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$display_name_5}
-account.5.display_name = {$display_name_5}
-account.5.auth_name = {$auth_id_5}
-account.5.password = {$user_password_5}
-account.5.user_name = {$user_id_5} 
-account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if}
+account.5.label = {$account.5.display_name}
+account.5.display_name = {$account.5.display_name}
+account.5.auth_name = {$account.5.auth_id}
+account.5.password = {$account.5.password}
+account.5.user_name = {$account.5.user_id} 
+account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
 
-account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5}
-account.5.outbound_proxy.1.port = 5060
+account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
+account.5.outbound_proxy.1.port = {$account.5.sip_port}
 account.5.dial_tone =
-account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5}
-account.5.outbound_proxy.2.port = 5060
+account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
+account.5.outbound_proxy.2.port = {$account.5.sip_port}
 account.5.outbound_proxy_fallback_interval =
 
 ##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0.
 
-{if $sip_transport_1 == 'udp'}account.5.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.5.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.5.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.5.sip_server.1.transport_type = 3{/if}
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.1.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.1.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.1.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.1.transport_type = 3{/if}
 
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
 
-{if $sip_transport_2 == 'udp'}account.5.sip_server.2.transport_type = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.5.sip_server.2.transport_type = 1{/if}
-{if $sip_transport_2 == 'tls'}account.5.sip_server.2.transport_type = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.5.sip_server.2.transport_type = 3{/if}
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.2.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.2.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.2.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.2.transport_type = 3{/if}
 
 
 #######################################################################################
@@ -1910,25 +1883,16 @@ account.5.outbound_proxy_fallback_interval =
 account.5.naptr_build = 0
 account.5.fallback.redundancy_type = 0
 account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.5.sip_server.1.address = {$server_address_5}
-{if $sip_transport_1 == 'dns srv'}
-account.5.sip_server.1.port = 0
-{else}
-account.5.sip_server.1.port = {$sip_port_1}
-{/if} 
-account.5.sip_server.1.expires = {$register_expires_1}
+account.5.sip_server.1.address = {$account.5.server.1.address}
+account.5.sip_server.1.port = {$account.5.sip_port}
+account.5.sip_server.1.expires = {$account.5.register_expires}
 account.5.sip_server.1.retry_counts = 3
 account.5.sip_server.1.failback_mode = 0
 account.5.sip_server.1.failback_timeout = 3600
 account.5.sip_server.1.register_on_enable = 0
-
-account.5.sip_server.2.address =
-{if $sip_transport_2 == 'dns srv'}
-account.5.sip_server.2.port = 0
-{else}
-account.5.sip_server.2.port = {$sip_port_2}
-{/if} 
-account.5.sip_server.2.expires = {$register_expires_2}
+account.5.sip_server.2.address = {$account.5.server.2.address}
+account.5.sip_server.2.port = {$account.5.sip_port}
+account.5.sip_server.2.expires = {$account.5.register_expires}
 account.5.sip_server.2.retry_counts = 3
 account.5.sip_server.2.failback_mode = 0
 account.5.sip_server.2.failback_timeout = 3600
@@ -2052,7 +2016,7 @@ account.5.blf.match_host.enable=
 #######################################################################################
 ##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
 ##The default value is 0.
-account.5.shared_line = {$shared_line_5}
+account.5.shared_line = {$account.5.shared_line}
 ##It configures the BLA number for account X.
 ##The default value is blank.
 account.5.bla_number = 
@@ -2335,41 +2299,41 @@ account.5.xsi.port =
 #######################################################################################
 ##                           Account6 Basic Settings                                 ##
 #######################################################################################
-{if isset($user_password_6) }
+{if isset($account.6.password) }
 account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$display_name_6}
-account.6.display_name = {$display_name_6}
-account.6.auth_name = {$auth_id_6}
-account.6.password = {$user_password_6}
-account.6.user_name = {$user_id_6} 
-account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if}
+account.6.label = {$account.6.display_name}
+account.6.display_name = {$account.6.display_name}
+account.6.auth_name = {$account.6.auth_id}
+account.6.password = {$account.6.password}
+account.6.user_name = {$account.6.user_id} 
+account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
 
-account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6}
-account.6.outbound_proxy.1.port = 5060
+account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}
+account.6.outbound_proxy.1.port = {$account.6.sip_port}
 account.6.dial_tone =
-account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6}
-account.6.outbound_proxy.2.port = 5060
+account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
+account.6.outbound_proxy.2.port = {$account.6.sip_port}
 account.6.outbound_proxy_fallback_interval =
 
 ##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0.
 
-{if $sip_transport_1 == 'udp'}account.6.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.6.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.6.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.6.sip_server.1.transport_type = 3{/if}
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.1.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.1.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.1.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.1.transport_type = 3{/if}
 
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
 
 
-{if $sip_transport_2 == 'udp'}account.6.sip_server.2.transport_type = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.6.sip_server.2.transport_type = 1{/if}
-{if $sip_transport_2 == 'tls'}account.6.sip_server.2.transport_type = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.6.sip_server.2.transport_type = 3{/if}
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.2.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.2.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.2.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.2.transport_type = 3{/if}
 
 
 #######################################################################################
@@ -2379,25 +2343,16 @@ account.6.outbound_proxy_fallback_interval =
 account.6.naptr_build = 0
 account.6.fallback.redundancy_type = 0
 account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.6.sip_server.1.address = {$server_address_6}
-{if $sip_transport_1 == 'dns srv'}
-account.6.sip_server.1.port = 0
-{else}
-account.6.sip_server.1.port = {$sip_port_1}
-{/if} 
-account.6.sip_server.1.expires = {$register_expires_1}
+account.6.sip_server.1.address = {$account.6.server.1.address}
+account.6.sip_server.1.port = {$account.6.sip_port}
+account.6.sip_server.1.expires = {$account.6.register_expires}
 account.6.sip_server.1.retry_counts = 3
 account.6.sip_server.1.failback_mode = 0
 account.6.sip_server.1.failback_timeout = 3600
 account.6.sip_server.1.register_on_enable = 0
-
-account.6.sip_server.2.address =
-{if $sip_transport_2 == 'dns srv'}
-account.6.sip_server.2.port = 0
-{else}
-account.6.sip_server.2.port = {$sip_port_2}
-{/if} 
-account.6.sip_server.2.expires = {$register_expires_2}
+account.6.sip_server.2.address = {$account.6.server.2.address}
+account.6.sip_server.2.port = {$account.6.sip_port}
+account.6.sip_server.2.expires = {$account.6.register_expires}
 account.6.sip_server.2.retry_counts = 3
 account.6.sip_server.2.failback_mode = 0
 account.6.sip_server.2.failback_timeout = 3600