diff --git a/src/localbuddy.cpp b/src/localbuddy.cpp
index 65d54d2b43566eb0f7e01aa794e32fe0844e84f5..e8e5e27922fe834b1b225fc8f6aa94b336e24bb3 100644
--- a/src/localbuddy.cpp
+++ b/src/localbuddy.cpp
@@ -39,7 +39,7 @@ bool LocalBuddy::setName(const std::string &name) {
 	m_name = name;
 	try {
 		generateJID();
-		return true;
+		return m_jid.isValid();
 	} catch (...) {
 		m_name = oldName;
 		return false;