diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp
index 942d45080..c5948bf5d 100644
--- a/common/server_protocolhandler.cpp
+++ b/common/server_protocolhandler.cpp
@@ -353,7 +353,6 @@ ResponseCode Server_ProtocolHandler::cmdJoinRoom(Command_JoinRoom *cmd, CommandC
 		return RespNameNotFound;
 
 	r->addClient(this);
-	connect(r, SIGNAL(gameCreated(Server_Game *)), this, SLOT(gameCreated(Server_Game *)));
 	rooms.insert(r->getId(), r);
 	
 	enqueueProtocolItem(new Event_RoomSay(r->getId(), QString(), r->getJoinMessage()));
diff --git a/common/server_protocolhandler.h b/common/server_protocolhandler.h
index e8b4dfac6..075ba0cfb 100644
--- a/common/server_protocolhandler.h
+++ b/common/server_protocolhandler.h
@@ -91,7 +91,6 @@ private:
 	ResponseCode processCommandHelper(Command *command, CommandContainer *cont);
 private slots:
 	void pingClockTimeout();
-	void gameCreated(Server_Game *game);
 public:
 	Server_ProtocolHandler(Server *_server, QObject *parent = 0);
 	~Server_ProtocolHandler();
@@ -104,6 +103,7 @@ public:
 	const QMap<QString, ServerInfo_User *> &getBuddyList() const { return buddyList; }
 	const QMap<QString, ServerInfo_User *> &getIgnoreList() const { return ignoreList; }
 
+	void gameCreated(Server_Game *game);
 	int getLastCommandTime() const { return timeRunning - lastDataReceived; }
 	void processCommandContainer(CommandContainer *cont);
 	virtual void sendProtocolItem(ProtocolItem *item, bool deleteItem = true) = 0;
diff --git a/common/server_room.cpp b/common/server_room.cpp
index 4e9182186..a80856923 100644
--- a/common/server_room.cpp
+++ b/common/server_room.cpp
@@ -77,6 +77,7 @@ void Server_Room::doCreateGame(const QString &description, const QString &passwo
 	
 	broadcastGameListUpdate(newGame);
 	
+	creator->gameCreated(newGame);
 	emit gameCreated(newGame);
 	emit roomInfoChanged();
 }