diff --git a/src/userregistry.cpp b/src/userregistry.cpp
index bfdb8faf6d3f886eaf8e24921fec8ff29dacd4bc..c6287faf99854f712bb9b877550836bc9be67f14 100644
--- a/src/userregistry.cpp
+++ b/src/userregistry.cpp
@@ -117,7 +117,9 @@ void UserRegistry::onPasswordInvalid(const Swift::JID &user) {
 }
 
 const std::string &UserRegistry::getUserPassword(const std::string &barejid) {
-	return users[barejid].password;
+	if (users.find(barejid) != users.end())
+		return users[barejid].password;
+	return empty;
 }
 
 }