diff --git a/src/blackcore/dbus_server.cpp b/src/blackcore/dbus_server.cpp
index 2d354d295..bcd373109 100644
--- a/src/blackcore/dbus_server.cpp
+++ b/src/blackcore/dbus_server.cpp
@@ -21,7 +21,7 @@ namespace BlackCore
     CDBusServer::CDBusServer(const QString &address, QObject *parent) :
         QObject(parent), m_busServer(CDBusServer::isP2P(address) ? address : "unix:tmpdir=/tmp" , parent), m_serverMode(CDBusServer::SERVERMODE_P2P)
     {
-        if (address.isEmpty() || address.toLower() == "session")
+        if (address.isEmpty() || address.toLower() == CDBusServer::sessionDBusServer())
         {
             // we use a session bus connection instead of a real P2P connection
             this->m_serverMode = CDBusServer::SERVERMODE_SESSIONBUS;
@@ -33,7 +33,7 @@ namespace BlackCore
             }
             this->newConnection(con);
         }
-        else if (address.toLower() == "system")
+        else if (address.toLower() == CDBusServer::systemDBusServer())
         {
             // we use a system bus connection instead of a real P2P connection
             this->m_serverMode = CDBusServer::SERVERMODE_SYSTEMBUS;
diff --git a/src/blackcore/dbus_server.h b/src/blackcore/dbus_server.h
index 5a08ff3b0..abf5bdb87 100644
--- a/src/blackcore/dbus_server.h
+++ b/src/blackcore/dbus_server.h
@@ -102,6 +102,20 @@ namespace BlackCore
             return defaultConnection;
         }
 
+        //! \brief Denotes a session DBus server
+        static const QString &sessionDBusServer()
+        {
+            static QString session("session");
+            return session;
+        }
+
+        //! \brief Denotes a session DBus server
+        static const QString &systemDBusServer()
+        {
+            static QString system("system");
+            return system;
+        }
+
     private slots:
 
         //! \brief Called when a new DBus client has connected