diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index 63f1f127ea..c6c126c97a 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -4,7 +4,7 @@
 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
 
 #######################################################################################
-##                           Account1 Basic Settings                                 ##
+##                           Account 1 Basic Settings                                ##
 #######################################################################################
 {if isset($account.1.password) }
 account.1.enable = 1
@@ -20,14 +20,14 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 account.1.password = {$account.1.password}
-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 = {$account.1.outbound_proxy_primary}
 {if isset($outbound_proxy_1_port)}
 account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
 {else}
 account.1.outbound_proxy.1.port = {$account.1.sip_port}
-{/if}   
+{/if}
 account.1.dial_tone =
 account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
 {if isset($outbound_proxy_1_port)}
@@ -60,7 +60,13 @@ account.1.outbound_proxy_fallback_interval = 120
 account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+{if isset($account.1.server.1.address)}
 account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
 account.1.sip_server.1.port = {$account.1.sip_port}
 account.1.sip_server.1.expires = {$account.1.register_expires}
 account.1.sip_server.1.retry_counts = 3
@@ -485,7 +491,7 @@ account.1.xsi.port =
 
 
 #######################################################################################
-##                           Account2 Basic Settings                                 ##
+##                           Account 2 Basic Settings                                ##
 #######################################################################################
 {if isset($account.2.password) }
 account.2.enable = 1
@@ -496,11 +502,13 @@ 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}
+
 {if isset($account.2.server.1.address)}
 account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 {else}
 account.2.user_name = {$account.2.user_id}
-{/if} 
+{/if}
+
 account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
 
 account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
@@ -534,7 +542,13 @@ 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}
+
+{if isset($account.2.server.1.address)}
 account.2.sip_server.1.address = {$account.2.server.1.address}
+{else}
+account.2.sip_server.1.address = {$account.2.server_address}
+{/if}
+
 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
@@ -939,7 +953,7 @@ account.2.xsi.port =
 
 
 #######################################################################################
-##                           Account3 Basic Settings                                 ##
+##                           Account 3 Basic Settings                                ##
 #######################################################################################
 {if isset($account.3.password) }
 account.3.enable = 1
@@ -950,11 +964,13 @@ 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}
+
 {if isset($account.3.server.1.address)}
 account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 {else}
 account.3.user_name = {$account.3.user_id}
-{/if} 
+{/if}
+
 account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
 
 account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
@@ -989,7 +1005,13 @@ 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}
+
+{if isset($account.3.server.1.address)}
 account.3.sip_server.1.address = {$account.3.server.1.address}
+{else}
+account.3.sip_server.1.address = {$account.3.server_address}
+{/if}
+
 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
@@ -1394,7 +1416,7 @@ account.3.xsi.port =
 
 
 #######################################################################################
-##                           Account4 Basic Settings                                 ##
+##                           Account 4 Basic Settings                                ##
 #######################################################################################
 {if isset($account.4.password) }
 account.4.enable = 1
@@ -1443,7 +1465,13 @@ 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}
+
+{if isset($account.4.server.1.address)}
 account.4.sip_server.1.address = {$account.4.server.1.address}
+{else}
+account.4.sip_server.1.address = {$account.4.server_address}
+{/if}
+
 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
@@ -1854,7 +1882,7 @@ account.4.xsi.port =
 
 
 #######################################################################################
-##                           Account5 Basic Settings                                 ##
+##                           Account 5 Basic Settings                                ##
 #######################################################################################
 {if isset($account.5.password) }
 account.5.enable = 1
@@ -1903,7 +1931,13 @@ 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}
+
+{if isset($account.5.server.1.address)}
 account.5.sip_server.1.address = {$account.5.server.1.address}
+{else}
+account.5.sip_server.1.address = {$account.5.server_address}
+{/if}
+
 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
@@ -2317,7 +2351,7 @@ account.5.xsi.port =
 
 
 #######################################################################################
-##                           Account6 Basic Settings                                 ##
+##                           Account 6 Basic Settings                                ##
 #######################################################################################
 {if isset($account.6.password) }
 account.6.enable = 1
@@ -2367,7 +2401,13 @@ 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}
+
+{if isset($account.6.server.1.address)}
 account.6.sip_server.1.address = {$account.6.server.1.address}
+{else}
+account.6.sip_server.1.address = {$account.6.server_address}
+{/if}
+
 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