diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index 8e1c1e1a..d2da5047 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -123,7 +123,8 @@ int main(int argc, char **argv)
 	bool no_daemon = false;
 	std::string config_file;
 	std::string jid;
-	
+
+	setlocale(LC_ALL, "");
 
 #ifndef WIN32
 	if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) {
diff --git a/src/admininterface.cpp b/src/admininterface.cpp
index 18704c93..e7ac7d0e 100644
--- a/src/admininterface.cpp
+++ b/src/admininterface.cpp
@@ -291,10 +291,10 @@ void AdminInterface::handleQuery(Swift::Message::ref message) {
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 2) {
 			if (m_userRegistration->unregisterUser(args[1])) {
-				message->setBody("User unregistered.");
+				message->setBody("User '" + args[1] + "' unregistered.");
 			}
 			else {
-				message->setBody("Registration failed: User is not registered");
+				message->setBody("Registration failed: User '" + args[1] + "' is not registered");
 			}
 		}
 		else {