diff --git a/gajim/common/app.py b/gajim/common/app.py
index c6ab64a19..e414f40a3 100644
--- a/gajim/common/app.py
+++ b/gajim/common/app.py
@@ -397,7 +397,8 @@ def get_enabled_accounts_with_labels(exclude_local=True):
     accounts = []
     for acc in connections:
         if not exclude_local or acc != 'Local':
-            acc_label = config.get_per('accounts', acc, 'account_label')
+            acc_label = config.get_per(
+                'accounts', acc, 'account_label') or acc
             accounts.append([acc, acc_label])
     accounts.sort(key=lambda xs: str.lower(xs[1]))
     return accounts