diff --git a/src/ChooseAccountVC.mm b/src/ChooseAccountVC.mm
index 41825b35a6469a81191e1791db6c003bd8da1548..5faa9900c406d59caa46c4548cb2c9bcb3bec846 100644
--- a/src/ChooseAccountVC.mm
+++ b/src/ChooseAccountVC.mm
@@ -252,9 +252,10 @@ NSMenuItem* selectedMenuItem;
 -(NSString*) itemTitleForAccount:(const lrc::api::account::Info&) account {
     NSString* alias = bestNameForAccount(account);
     NSString* userNameString = [self nameForAccount: account];
-    if(![alias isEqualToString:userNameString]) {
-        alias = [NSString stringWithFormat: @"%@\n", alias];
+    if([alias isEqualToString:userNameString] || [userNameString length] == 0) {
+        return alias;
     }
+    alias = [NSString stringWithFormat: @"%@\n", alias];
     return [alias stringByAppendingString:userNameString];
 }