diff --git a/src/libtomahawk/accounts/AccountManager.cpp b/src/libtomahawk/accounts/AccountManager.cpp
index 22ab46d78..75db452ee 100644
--- a/src/libtomahawk/accounts/AccountManager.cpp
+++ b/src/libtomahawk/accounts/AccountManager.cpp
@@ -234,8 +234,11 @@ AccountManager::connectAll()
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
     foreach( Account* acc, m_accounts )
     {
-        acc->authenticate();
-        m_enabledAccounts << acc;
+        if ( acc->enabled() )
+        {
+            acc->authenticate();
+            m_enabledAccounts << acc;
+        }
 
     }
     m_connected = true;