diff --git a/src/UsersReconnecter.cpp b/src/UsersReconnecter.cpp
index 67adac038721bf2934e8af377f152d51fef104e4..ca5623637f92ff928d35ba6e1729dc41488b65d5 100644
--- a/src/UsersReconnecter.cpp
+++ b/src/UsersReconnecter.cpp
@@ -23,6 +23,7 @@
 #include "transport/Transport.h"
 #include "transport/Logging.h"
 #include "transport/Frontend.h"
+#include "transport/Config.h"
 
 #include <iostream>
 #include <boost/bind.hpp>
@@ -72,7 +73,12 @@ void UsersReconnecter::handleConnected() {
 	LOG4CXX_INFO(logger, "Starting UserReconnecter.");
 	m_started = true;
 
-	m_storageBackend->getOnlineUsers(m_users);
+	if (CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "service.reconnect_all_users", false)) {
+		m_storageBackend->getUsers(m_users);
+	}
+	else {
+		m_storageBackend->getOnlineUsers(m_users);
+	}
 
 	reconnectNextUser();
 }