diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index af92f40b0..856b6d247 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -710,7 +710,7 @@ void MessageServerAuthenticate::process(Connection *cCon) {
 	else if (! ChanACL::hasPermission(pSrcPlayer, lc, ChanACL::Enter))
 		lc = Channel::get(0);
 
-	g_sServer->playerEnterChannel(pSrcPlayer, lc, true);
+//	g_sServer->playerEnterChannel(pSrcPlayer, lc, true);
 	ServerDB::conLoggedOn(pSrcPlayer, cCon);
 
 	QQueue<Channel *> q;
@@ -794,6 +794,7 @@ void MessageServerAuthenticate::process(Connection *cCon) {
 		g_sServer->sendMessage(cCon, &mpm);
 	}
 
+	g_sServer->playerEnterChannel(pSrcPlayer, lc, false);
 
 	MessageServerSync mssMsg;
 	mssMsg.sPlayerId = pSrcPlayer->sId;
@@ -803,7 +804,6 @@ void MessageServerAuthenticate::process(Connection *cCon) {
 	g_sServer->log(QString("Authenticated: %1").arg(qsUsername), cCon);
 
 	dbus->playerConnected(pSrcPlayer);
-	g_sServer->playerEnterChannel(pSrcPlayer, lc, false);
 }
 
 void MessageServerBanList::process(Connection *cCon) {
diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
index b835c74d4..6328da3f6 100644
--- a/src/murmur/ServerDB.cpp
+++ b/src/murmur/ServerDB.cpp
@@ -526,7 +526,7 @@ void ServerDB::conLoggedOn(Player *p, Connection *con) {
 	query.prepare("INSERT INTO connections (con_id, player_id, channel_id, player_name, ip, port) VALUES (?,?,?,?,?,?)");
 	query.addBindValue(p->sId);
 	query.addBindValue(p->iId);
-	query.addBindValue(p->cChannel->iId);
+	query.addBindValue(QVariant());
 	query.addBindValue(p->qsName);
 	query.addBindValue(con->peerAddress().toString());
 	query.addBindValue(con->peerPort());