diff --git a/api/src/Mail/Account.php b/api/src/Mail/Account.php
index dd16437729..1a8ee94d87 100644
--- a/api/src/Mail/Account.php
+++ b/api/src/Mail/Account.php
@@ -1598,7 +1598,6 @@ class Account implements \ArrayAccess
 			catch(\Exception $e) {
 				_egw_log_exception($e);
 			}
-
 		}
 		if (strlen(trim($account['ident_realname'].$account['ident_org'])))
 		{
@@ -1608,11 +1607,11 @@ class Account implements \ArrayAccess
 		{
 			$name = $account['acc_name'];
 		}
-		if (strpos($account['ident_email'], '@') !== false)
+		if (!empty(trim($account['ident_email'])))
 		{
 			$name .= ' <'.$account['ident_email'].'>';
 		}
-		elseif(strpos($account['acc_imap_username'], '@') !== false)
+		elseif(!empty(trim($account['acc_imap_username'])))
 		{
 			$name .= ' <'.$account['acc_imap_username'].'>';
 		}