diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index 9d303c1d56..4c2de0c3b9 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -1800,48 +1800,69 @@ account.4.xsi.port =
 #######################################################################################
 ##                           Account5 Basic Settings                                 ##       
 #######################################################################################
-account.5.enable = 
-account.5.label = 
-account.5.display_name =
-account.5.auth_name = 
-account.5.user_name = 
-account.5.password = 
-account.5.outbound_proxy_enable = 
-account.5.outbound_proxy.1.address = 
-account.5.outbound_proxy.1.port =   
+{if isset($user_password_5) }
+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.outbound_proxy.1.address = {$outbound_proxy_primary_5}
+account.5.outbound_proxy.1.port = 5060
 account.5.dial_tone =
-account.5.outbound_proxy.2.address =
-account.5.outbound_proxy.2.port =
+account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5}
+account.5.outbound_proxy.2.port = 5060
 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.
-account.5.sip_server.1.transport_type = 
+{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}
+
 ##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.5.sip_server.2.transport_type = 
+
+
+{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}
 
 #######################################################################################
 ##                          Failback                                                 ##       
 #######################################################################################
 
-account.5.naptr_build = 
-account.5.fallback.redundancy_type = 
-account.5.fallback.timeout = 
+account.5.naptr_build = 0
+account.5.fallback.redundancy_type = 0
+account.5.fallback.timeout = 120
 account.5.sip_server.1.address =
-account.5.sip_server.1.port = 
-account.5.sip_server.1.expires = 
-account.5.sip_server.1.retry_counts = 
-account.5.sip_server.1.failback_mode = 
-account.5.sip_server.1.failback_timeout = 
-account.5.sip_server.1.register_on_enable = 
+{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.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 =
-account.5.sip_server.2.port = 
-account.5.sip_server.2.expires = 
-account.5.sip_server.2.retry_counts = 
-account.5.sip_server.2.failback_mode = 
-account.5.sip_server.2.failback_timeout = 
-account.5.sip_server.2.register_on_enable = 
+{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.retry_counts = 3
+account.5.sip_server.2.failback_mode = 0
+account.5.sip_server.2.failback_timeout = 3600
+account.5.sip_server.2.register_on_enable = 0
 
 
 account.5.dns_cache_type = 
@@ -2225,49 +2246,69 @@ account.5.xsi.port =
 #######################################################################################
 ##                           Account6 Basic Settings                                 ##       
 #######################################################################################
-account.6.enable = 
-account.6.label = 
-account.6.display_name =
-account.6.auth_name = 
-account.6.user_name = 
-account.6.password = 
-account.6.outbound_proxy_enable = 
-account.6.outbound_proxy.1.address = 
-account.6.outbound_proxy.1.port =   
+{if isset($user_password_6) }
+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.outbound_proxy.1.address = {$outbound_proxy_primary_6}
+account.6.outbound_proxy.1.port = 5060
 account.6.dial_tone =
-account.6.outbound_proxy.2.address = 
-account.6.outbound_proxy.2.port =  
+account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6}
+account.6.outbound_proxy.2.port = 5060
 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.
-account.6.sip_server.1.transport_type = 
+{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}
+
 ##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.6.sip_server.2.transport_type = 
+
+
+{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}
 
 #######################################################################################
 ##                          Failback                                                 ##       
 #######################################################################################
 
-account.6.naptr_build = 
-account.6.fallback.redundancy_type = 
-account.6.fallback.timeout = 
+account.6.naptr_build = 0
+account.6.fallback.redundancy_type = 0
+account.6.fallback.timeout = 120
 account.6.sip_server.1.address =
-account.6.sip_server.1.port = 
-account.6.sip_server.1.expires = 
-account.6.sip_server.1.retry_counts = 
-account.6.sip_server.1.failback_mode = 
-account.6.sip_server.1.failback_timeout = 
-account.6.sip_server.1.register_on_enable = 
+{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.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 =
-account.6.sip_server.2.port = 
-account.6.sip_server.2.expires = 
-account.6.sip_server.2.retry_counts = 
-account.6.sip_server.2.failback_mode = 
-account.6.sip_server.2.failback_timeout = 
-account.6.sip_server.2.register_on_enable = 
-
+{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.retry_counts = 3
+account.6.sip_server.2.failback_mode = 0
+account.6.sip_server.2.failback_timeout = 3600
+account.6.sip_server.2.register_on_enable = 0
 
 account.6.dns_cache_type = 
 account.6.static_cache_pri =