diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java
index 242cae89..e96cbbb7 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java
@@ -152,23 +152,6 @@ public void setTaken(Color color, boolean isTaken, boolean isSelf, String name)
 
         if(isTaken) {
             if(isSelf) {
-                /*if(own != null) {
-                    switch (color) {
-                        case CYBER:
-                            cyberButton.setTaken(LobbyButton.Taken.NOT, name);
-                            break;
-                        case AIRFORCE:
-                            airforceButton.setTaken(LobbyButton.Taken.NOT, name);
-                            break;
-                        case ARMY:
-                            armyButton.setTaken(LobbyButton.Taken.NOT, name);
-                            break;
-                        case NAVY:
-                            navyButton.setTaken(LobbyButton.Taken.NOT, name);
-                            break;
-                    }
-                }*/
-
                 own = color;
                 taken = LobbyButton.Taken.SELF;
             } else {
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java
index f468d8d3..6d70ba50 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java
@@ -106,7 +106,8 @@ public void received(LobbyPlayerJoinedMessage msg){
         if (msg.isHost() && msg.getId() == parent.getOwnPlayerId()){
             logic.setHost(true);
         }
-        logic.addNotification(new TskSelectNotification(msg.getPlayer().getColor(), msg.getPlayer().getName(), parent.getOwnPlayerId()== msg.getId()));
+
+        logic.addNotification(new TskSelectNotification(msg.getPlayer().getColor(), msg.getPlayer().getName(), msg.getPlayer().getName().equals(parent.getOwnPlayerName())));
         logic.getGame().getPlayers().put(msg.getId(), msg.getPlayer());
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
index c268cc4f..1f1bbacb 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
@@ -63,7 +63,7 @@ public void initializeGame() {
     @Override
     public void received(JoinedLobbyMessage msg, int from) {
         Player player = new Player(msg.getName());
-        player.setColor(Color.getColorByIndex(this.logic.getGame().getPlayers().size()));
+        player.setColor(Color.NONE);
         this.logic.getGame().addPlayer(from, player);
         for (Map.Entry<Integer, Player> entry : this.logic.getGame().getPlayers().entrySet()) {
             this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue(), entry.getKey() == this.logic.getGame().getHost()));