diff --git a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp
index 5349ad395..92a48af6f 100644
--- a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp
+++ b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp
@@ -236,7 +236,13 @@ Tomahawk::Accounts::TelepathyConfigStorage::load( const QString& accountId, Acco
 
     Tp::AccountPtr account = m_tpam->accountForObjectPath( accountIdToTelepathyPath( accountId ) );
 
-    cfg.accountFriendlyName = "Tp:" + account->normalizedName();
+    if ( !account->normalizedName().isEmpty() )
+        cfg.accountFriendlyName = account->normalizedName();
+    else if ( !account->parameters()[ "account" ].isNull() )
+        cfg.accountFriendlyName = account->parameters()[ "account" ].toString();
+
+    if ( cfg.accountFriendlyName.isEmpty() ) //this should never happen
+        cfg.accountFriendlyName = accountId;
 
     cfg.enabled = true;
     cfg.acl = QVariantMap();