diff --git a/src/buddy.cpp b/src/buddy.cpp
index 535a285af265beb73a76868fa8e891f520eebb85..f05fb901c7d20b3697ee199d65de822a506c7b0f 100644
--- a/src/buddy.cpp
+++ b/src/buddy.cpp
@@ -51,9 +51,11 @@ long Buddy::getID() {
 void Buddy::setFlags(BuddyFlag flags) {
 	m_flags = flags;
 
-	try {
-		generateJID();
-	} catch (...) {
+	if (!getSafeName().empty()) {
+		try {
+			generateJID();
+		} catch (...) {
+		}
 	}
 }