diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java
index 366404cff6a..6ea79cf2bc0 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameController.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameController.java
@@ -317,8 +317,17 @@ public class GameController implements GameCallback {
             for (final Entry<UUID, GameSessionPlayer> entry : gameSessions.entrySet()) {
                 entry.getValue().init();
             }
+
             GameWorker worker = new GameWorker(game, choosingPlayerId, this);
             gameFuture = gameExecutor.submit(worker);
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ex) {
+            }
+            if (game.getState().getChoosingPlayerId() != null) {
+                // start timer to force player to choose starting player otherwise loosing by being idle
+                setupTimeout(game.getState().getChoosingPlayerId());
+            }
         }
     }
 
diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java
index 7f4f936bba3..4cbe21e3e8f 100644
--- a/Mage/src/main/java/mage/game/GameImpl.java
+++ b/Mage/src/main/java/mage/game/GameImpl.java
@@ -1948,7 +1948,7 @@ public abstract class GameImpl implements Game, Serializable {
                         Player controller = this.getPlayer(planeswalker.getControllerId());
                         if (controller != null) {
                             Target targetPlaneswalkerToKeep = new TargetPermanent(filterPlaneswalker);
-                            targetPlaneswalkerToKeep.setTargetName(planeswalker.getName() + " to keep?");
+                            targetPlaneswalkerToKeep.setTargetName(planeswalkertype.toString() + " to keep?");
                             controller.chooseTarget(Outcome.Benefit, targetPlaneswalkerToKeep, null, this);
                             for (Permanent dupPlaneswalker : this.getBattlefield().getActivePermanents(filterPlaneswalker, planeswalker.getControllerId(), this)) {
                                 if (!targetPlaneswalkerToKeep.getTargets().contains(dupPlaneswalker.getId())) {