diff --git a/Webservice/server.js b/Webservice/server.js
index be57531..91c7930 100644
--- a/Webservice/server.js
+++ b/Webservice/server.js
@@ -43,16 +43,16 @@ io.on('connection', socket => {
     socket.on('add user', function (data) {
         socket.username = data.username;
         socket.room = data.room_name;
-
+        
         if (game[socket.room] === undefined) {
             game[socket.room] = new Game();
         }
-
+        
         if (game[socket.room].add_player(socket.username)) {
-
+            
             game[socket.room].addPlayerName(data.username);
             addedUser = true;
-
+            
             socket.emit('login');
             socket.join(socket.room);
             io.in(socket.room).emit('updatePlayerNames', game[socket.room].getPlayerNames());
@@ -80,7 +80,6 @@ io.on('connection', socket => {
 
     socket.on('disconnect', function () {
         if (game[socket.room] !== undefined && addedUser) {
-            if (game[socket.room].current_player_is(socket.username)) socket.broadcast.to(socket.room).emit('card destroyed');
 
             game[socket.room].removePlayerName(socket.username);
             io.in(socket.room).emit('updatePlayerNames', game[socket.room].getPlayerNames());
@@ -88,6 +87,8 @@ io.on('connection', socket => {
             socket.broadcast.to(socket.room).emit('user left', socket.username);
             game[socket.room].remove_player(socket.username);
 
+            // TODO Close card if card is opened and active player left
+
             socket.leave(socket.room);
 
             if (game[socket.room].players.length === 0) delete game[socket.room];
diff --git a/public/js/game.js b/public/js/game.js
index f84bf1e..b2ab7de 100644
--- a/public/js/game.js
+++ b/public/js/game.js
@@ -268,7 +268,7 @@ function start_game() {
                 break;
         }
 
-        if (x === 1 && y === 9) {
+        if (x === 1 && y === 9 && data.position !== 0) {
             card = new Card(game_board_size, "",
                 {"text": playerNames[0] ? playerNames[0] + ": " + positions[0] : ("Kein Spieler"), "status": false},
                 {"text": playerNames[1] ? playerNames[1] + ": " + positions[1] : ("Kein Spieler"), "status": false},