diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index 4eeb6c2426..9d303c1d56 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -499,14 +499,13 @@ account.2.outbound_proxy.2.port = 5060
 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_2 == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_2 == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
+{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}
 
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
-account.2.sip_server.2.transport_type = 
 
 {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}
@@ -854,7 +853,7 @@ account.2.music_server_uri =
 #######################################################################################
 account.2.auto_answer = 
 account.2.missed_calllog = 
-account.2.100rel_enable = 
+account.2.100rel_enable = {$yealink_retransmission}
 account.2.enable_user_equal_phone = 
 account.2.compact_header_enable = 
 account.2.custom_ua =
@@ -919,48 +918,69 @@ account.2.xsi.port =
 #######################################################################################
 ##                           Account3 Basic Settings                                 ##       
 #######################################################################################
-account.3.enable = 
-account.3.label = 
-account.3.display_name =
-account.3.auth_name = 
-account.3.user_name = 
-account.3.password = 
-account.3.outbound_proxy_enable = 
-account.3.outbound_proxy.1.address = 
-account.3.outbound_proxy.1.port = 
+{if isset($user_password_3) }
+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.outbound_proxy.1.address = {$outbound_proxy_primary_3}
+account.3.outbound_proxy.1.port = 5060
 account.3.dial_tone =
-account.3.outbound_proxy.2.address =
-account.3.outbound_proxy.2.port =
+account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3}
+account.3.outbound_proxy.2.port = 5060
 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.
-account.3.sip_server.1.transport_type = 
+{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}
+
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
-account.3.sip_server.2.transport_type = 
+
+
+{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}
 
 #######################################################################################
 ##                          Failback                                                 ##       
 #######################################################################################
 
-account.3.naptr_build = 
-account.3.fallback.redundancy_type = 
-account.3.fallback.timeout = 
+account.3.naptr_build = 0
+account.3.fallback.redundancy_type = 0
+account.3.fallback.timeout = 120
 account.3.sip_server.1.address =
-account.3.sip_server.1.port = 
-account.3.sip_server.1.expires = 
-account.3.sip_server.1.retry_counts = 
-account.3.sip_server.1.failback_mode = 
-account.3.sip_server.1.failback_timeout = 
-account.3.sip_server.1.register_on_enable = 
+{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.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 =
-account.3.sip_server.2.port = 
-account.3.sip_server.2.expires = 
-account.3.sip_server.2.retry_counts = 
-account.3.sip_server.2.failback_mode = 
-account.3.sip_server.2.failback_timeout = 
-account.3.sip_server.2.register_on_enable = 
+{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.retry_counts = 3
+account.3.sip_server.2.failback_mode = 0
+account.3.sip_server.2.failback_timeout = 3600
+account.3.sip_server.2.register_on_enable = 0
 
 
 account.3.dns_cache_type = 
@@ -1250,7 +1270,7 @@ account.3.cp_source = 2
 #######################################################################################
 ##                            Session Timer                                          ##       
 #######################################################################################
-account.3.session_timer.enable = 
+account.3.session_timer.enable = {$yealink_session_timer}
 account.3.session_timer.expires = 
 account.3.session_timer.refresher = 
 
@@ -1271,7 +1291,7 @@ account.3.music_server_uri =
 #######################################################################################
 account.3.auto_answer = 
 account.3.missed_calllog = 
-account.3.100rel_enable = 
+account.3.100rel_enable = {$yealink_retransmission}
 account.3.enable_user_equal_phone = 
 account.3.compact_header_enable = 
 account.3.custom_ua = 
@@ -1335,48 +1355,69 @@ account.3.xsi.port =
 #######################################################################################
 ##                           Account4 Basic Settings                                 ##       
 #######################################################################################
-account.4.enable = 
-account.4.label = 
-account.4.display_name =
-account.4.auth_name = 
-account.4.user_name = 
-account.4.password = 
-account.4.outbound_proxy_enable = 
-account.4.outbound_proxy.1.address = 
-account.4.outbound_proxy.1.port =   
+{if isset($user_password_4) }
+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.outbound_proxy.1.address = {$outbound_proxy_primary_4}
+account.4.outbound_proxy.1.port = 5060
 account.4.dial_tone =
-account.4.outbound_proxy.2.address =
-account.4.outbound_proxy.2.port =
+account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4}
+account.4.outbound_proxy.2.port = 5060
 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.
-account.4.sip_server.1.transport_type = 
+{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}
+
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
-account.4.sip_server.2.transport_type = 
+
+
+{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}
 
 #######################################################################################
 ##                          Failback                                                 ##       
 #######################################################################################
 
-account.4.naptr_build = 
-account.4.fallback.redundancy_type = 
-account.4.fallback.timeout = 
+account.4.naptr_build = 0
+account.4.fallback.redundancy_type = 0
+account.4.fallback.timeout = 120
 account.4.sip_server.1.address =
-account.4.sip_server.1.port = 
-account.4.sip_server.1.expires = 
-account.4.sip_server.1.retry_counts = 
-account.4.sip_server.1.failback_mode = 
-account.4.sip_server.1.failback_timeout = 
-account.4.sip_server.1.register_on_enable = 
+{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.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 =
-account.4.sip_server.2.port = 
-account.4.sip_server.2.expires = 
-account.4.sip_server.2.retry_counts = 
-account.4.sip_server.2.failback_mode = 
-account.4.sip_server.2.failback_timeout = 
-account.4.sip_server.2.register_on_enable = 
+{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.retry_counts = 3
+account.4.sip_server.2.failback_mode = 0
+account.4.sip_server.2.failback_timeout = 3600
+account.4.sip_server.2.register_on_enable = 0
 
 
 account.4.dns_cache_type = 
@@ -1675,7 +1716,7 @@ account.4.cp_source = 2
 #######################################################################################
 ##                            Session Timer                                          ##       
 #######################################################################################
-account.4.session_timer.enable = 
+account.4.session_timer.enable = {$yealink_session_timer}
 account.4.session_timer.expires = 
 account.4.session_timer.refresher = 
 
@@ -1696,7 +1737,7 @@ account.4.music_server_uri =
 #######################################################################################
 account.4.auto_answer = 
 account.4.missed_calllog = 
-account.4.100rel_enable = 
+account.4.100rel_enable = {$yealink_retransmission}
 account.4.enable_user_equal_phone = 
 account.4.compact_header_enable = 
 account.4.custom_ua =
@@ -2098,7 +2139,7 @@ account.5.cp_source = 2
 #######################################################################################
 ##                            Session Timer                                          ##       
 #######################################################################################
-account.5.session_timer.enable = 
+account.5.session_timer.enable = {$yealink_session_timer}
 account.5.session_timer.expires = 
 account.5.session_timer.refresher = 
 
@@ -2119,7 +2160,7 @@ account.5.music_server_uri =
 #######################################################################################
 account.5.auto_answer = 
 account.5.missed_calllog = 
-account.5.100rel_enable = 
+account.5.100rel_enable = {$yealink_retransmission}
 account.5.enable_user_equal_phone = 
 account.5.compact_header_enable = 
 account.5.custom_ua =
@@ -2523,7 +2564,7 @@ account.6.cp_source = 2
 #######################################################################################
 ##                            Session Timer                                          ##       
 #######################################################################################
-account.6.session_timer.enable = 
+account.6.session_timer.enable = {$yealink_session_timer}
 account.6.session_timer.expires = 
 account.6.session_timer.refresher = 
 
@@ -2544,7 +2585,7 @@ account.6.music_server_uri =
 #######################################################################################
 account.6.auto_answer = 
 account.6.missed_calllog = 
-account.6.100rel_enable = 
+account.6.100rel_enable = {$yealink_retransmission}
 account.6.enable_user_equal_phone = 
 account.6.compact_header_enable = 
 account.6.custom_ua =