diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index f3f891f07f8b6e5b18ddbcbc8c63d07322b19bcc..2ae551af5f21cc4a6e43d281e67e896b8cac82c2 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -351,6 +351,10 @@ void NetworkPluginServer::handleSessionFinished(Backend *c) {
 
 	// If there are users associated with this backend, it must have crashed, so print error output
 	// and disconnect users
+	if (!c->users.empty()) {
+		m_crashedBackends.push_back(c->id);
+	}
+
 	for (std::list<User *>::const_iterator it = c->users.begin(); it != c->users.end(); it++) {
 		LOG4CXX_ERROR(logger, "Backend " << c << " disconnected (probably crashed) with active user " << (*it)->getJID().toString());
 		(*it)->setData(NULL);