diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp
index f3ac2a95c..e7156ed81 100644
--- a/src/TomahawkApp.cpp
+++ b/src/TomahawkApp.cpp
@@ -198,6 +198,8 @@ TomahawkApp::init()
     QFontMetrics fm( f );
     TomahawkUtils::setHeaderHeight( fm.height() + 8 );
 #endif
+    
+    TomahawkUtils::setHeadless( m_headless );
 
     TomahawkSettings* s = TomahawkSettings::instance();
 
diff --git a/src/TomahawkApp.h b/src/TomahawkApp.h
index 417bc3094..ae8a7c127 100644
--- a/src/TomahawkApp.h
+++ b/src/TomahawkApp.h
@@ -98,7 +98,7 @@ public:
     virtual bool loadUrl( const QString& url );
 
     bool isTomahawkLoaded() const { return m_loaded; }
-
+    
 signals:
     void tomahawkLoaded();
 
diff --git a/src/libtomahawk/AclRegistry.cpp b/src/libtomahawk/AclRegistry.cpp
index f8b492582..e7dce61c8 100644
--- a/src/libtomahawk/AclRegistry.cpp
+++ b/src/libtomahawk/AclRegistry.cpp
@@ -170,7 +170,7 @@ ACLRegistry::isAuthorizedUser( const QString& dbid, const QString &username, ACL
 #ifdef ENABLE_HEADLESS
     user.acl = ACLRegistry::Stream;
 #else
-    else
+    if ( !TomahawkUtils::headless() )
     {
         getUserDecision( user, username );
         return ACLRegistry::NotFound;
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index 179308a52..6fee59c7c 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -64,7 +64,7 @@ namespace TomahawkUtils
 {
 static quint64 s_infosystemRequestId = 0;
 static QMutex s_infosystemRequestIdMutex;
-
+static bool s_headless = false;
 
 #ifdef Q_WS_MAC
 QString
@@ -76,6 +76,20 @@ appSupportFolderPath()
 #endif // Q_WS_MAC
 
 
+bool
+headless()
+{
+    return s_headless;
+}
+
+
+void
+setHeadless( bool headless )
+{
+    s_headless = headless;
+}
+
+
 QString
 appFriendlyVersion()
 {
diff --git a/src/libtomahawk/utils/TomahawkUtils.h b/src/libtomahawk/utils/TomahawkUtils.h
index 5da2fab30..ebe21cb4b 100644
--- a/src/libtomahawk/utils/TomahawkUtils.h
+++ b/src/libtomahawk/utils/TomahawkUtils.h
@@ -87,6 +87,8 @@ namespace TomahawkUtils
         QNetworkProxy m_proxy;
     };
 
+    DLLEXPORT bool headless();
+    DLLEXPORT void setHeadless( bool headless );
 
     DLLEXPORT QString appFriendlyVersion();