diff --git a/src/localbuddy.cpp b/src/localbuddy.cpp
index 6d8d75305c9e92d3f10a4881d05a8d9453dd7c61..8e19f7fba5085d8f8cefbf484730af147f052c0a 100644
--- a/src/localbuddy.cpp
+++ b/src/localbuddy.cpp
@@ -31,6 +31,22 @@ LocalBuddy::LocalBuddy(RosterManager *rosterManager, long id) : Buddy(rosterMana
 LocalBuddy::~LocalBuddy() {
 }
 
+bool LocalBuddy::setName(const std::string &name) {
+	if (name == m_name) {
+		return true;
+	}
+	std::string oldName = name;
+	m_name = name;
+	try {
+		generateJID();
+		return true;
+	} catch (...) {
+		m_name = oldName;
+		return false;
+	}
+	
+}
+
 void LocalBuddy::setAlias(const std::string &alias) {
 //	if (m_firstSet) {
 //		m_firstSet = false;