diff --git a/src/buddy.cpp b/src/buddy.cpp
index b9879a048cdadeeb548b9ca8c0ef2b17bcb38f57..725b969c410ffca3ed4031b1a69b33b84f940751 100644
--- a/src/buddy.cpp
+++ b/src/buddy.cpp
@@ -169,6 +169,10 @@ std::string Buddy::JIDToLegacyName(const Swift::JID &jid) {
 	}
 	else {
 		name = jid.getUnescapedNode();
+		// Psi sucks...
+		if (name.find_last_of("\\40") != std::string::npos) {
+			name.replace(name.find_last_of("\\40"), 1, "@");
+		}
 	}
 	return name;
 }