diff --git a/resources/templates/provision/yealink/t54s/{$mac}.cfg b/resources/templates/provision/yealink/t54s/{$mac}.cfg
index 845652ab4e..cfa74ddffb 100644
--- a/resources/templates/provision/yealink/t54s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54s/{$mac}.cfg
@@ -204,7 +204,11 @@ 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.password = {$account.1.password}
+{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.sip_server.1.address= {$account.1.server_address}
 account.1.sip_server.1.port= {$account.1.sip_port}
@@ -266,7 +270,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}
+{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.sip_server.1.address= {$account.2.server_address}
 account.2.sip_server.1.port= {$account.2.sip_port}