diff --git a/src/userregistration.cpp b/src/userregistration.cpp
index f7de616e14cc1d24f977f3ea2af7ad7e5b650f6b..2be05fb24cb315fae538fb8e02882e4a22616c51 100644
--- a/src/userregistration.cpp
+++ b/src/userregistration.cpp
@@ -24,18 +24,17 @@
 #include "transport/transport.h"
 #include "transport/rostermanager.h"
 #include "transport/user.h"
+#include "transport/logging.h"
 #include "Swiften/Elements/ErrorPayload.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include "log4cxx/logger.h"
 
 using namespace Swift;
-using namespace log4cxx;
 
 namespace Transport {
 
-static LoggerPtr logger = Logger::getLogger("UserRegistration");
+DEFINE_LOGGER(logger, "UserRegistration");
 
 UserRegistration::UserRegistration(Component *component, UserManager *userManager, StorageBackend *storageBackend) : Swift::Responder<Swift::InBandRegistrationPayload>(component->m_iqRouter) {
 	m_component = component;
@@ -169,7 +168,7 @@ bool UserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID
 	std::string barejid = from.toBare().toString();
 
 	if (!CONFIG_BOOL(m_config,"registration.enable_public_registration")) {
-		std::list<std::string> const &x = CONFIG_LIST(m_config,"service.allowed_servers");
+		std::vector<std::string> const &x = CONFIG_VECTOR(m_config,"service.allowed_servers");
 		if (std::find(x.begin(), x.end(), from.getDomain()) == x.end()) {
 			LOG4CXX_INFO(logger, barejid << ": This user has no permissions to register an account")
 			sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify);
@@ -276,7 +275,7 @@ bool UserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID
 	std::string barejid = from.toBare().toString();
 
 	if (!CONFIG_BOOL(m_config,"registration.enable_public_registration")) {
-		std::list<std::string> const &x = CONFIG_LIST(m_config,"service.allowed_servers");
+		std::vector<std::string> const &x = CONFIG_VECTOR(m_config,"service.allowed_servers");
 		if (std::find(x.begin(), x.end(), from.getDomain()) == x.end()) {
 			LOG4CXX_INFO(logger, barejid << ": This user has no permissions to register an account")
 			sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify);
@@ -453,7 +452,7 @@ bool UserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID
 // #endif
 	if (!registered) {
 		res.jid = barejid;
-		res.uin = username;
+		res.uin = newUsername;
 		res.password = *payload->getPassword();
 		res.language = language;
 		res.encoding = encoding;
@@ -462,7 +461,7 @@ bool UserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID
 	}
 	else {
 		res.jid = barejid;
-		res.uin = username;
+		res.uin = newUsername;
 		res.password = *payload->getPassword();
 		res.language = language;
 		res.encoding = encoding;