diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index b875f352eb..63f1f127ea 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -14,7 +14,11 @@ account.1.enable = 0
 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.user_name = {$account.1.user_id} 
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
+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}
 
@@ -492,7 +496,11 @@ 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} 
+{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} 
 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}
@@ -942,7 +950,11 @@ 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} 
+{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} 
 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}
@@ -1393,7 +1405,11 @@ 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} 
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
+account.4.user_name = {$account.4.user_id}
+{/if} 
 account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
 
 account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
@@ -1849,7 +1865,11 @@ 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} 
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
+account.5.user_name = {$account.5.user_id}
+{/if} 
 account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
 
 account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
@@ -2308,7 +2328,11 @@ 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} 
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
+account.6.user_name = {$account.6.user_id}
+{/if} 
 account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
 
 account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}