diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index b40c5695..23ffa53d 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -230,7 +230,7 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 				res.password = "";
 				res.uin = presence->getFrom().getNode();
 				res.jid = userkey;
-				if (res.uin.find_last_of("%") != std::string::npos) { // OK
+				while (res.uin.find_last_of("%") != std::string::npos) { // OK
 					res.uin.replace(res.uin.find_last_of("%"), 1, "@"); // OK
 				}
 				if (m_storageBackend) {