diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp
index d7500e516..391598cbc 100644
--- a/cockatrice/src/client/tabs/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -388,7 +388,10 @@ void DeckViewContainer::setReadyStart(bool ready)
 void DeckViewContainer::readyAndUpdate()
 {
     setReadyStart(true);
-    readyStart();
+
+    Command_ReadyStart cmd;
+    cmd.set_ready(true);
+    parentGame->sendGameCommand(cmd, playerId);
 }
 
 void DeckViewContainer::setSideboardLocked(bool locked)
@@ -873,6 +876,15 @@ Player *TabGame::addPlayer(int playerId, const ServerInfo_User &info)
         connect(deckView, SIGNAL(newCardAdded(AbstractCardItem *)), this, SLOT(newCardAdded(AbstractCardItem *)));
         deckViewContainers.insert(playerId, deckView);
         deckViewContainerLayout->addWidget(deckView);
+
+        // auto load deck for player if that debug setting is enabled
+        QString deckPath = SettingsCache::instance().debug().getDeckPathForPlayer(newPlayer->getName());
+        if (!deckPath.isEmpty()) {
+            QTimer::singleShot(0, this, [deckView, deckPath] {
+                deckView->loadDeckFromFile(deckPath);
+                deckView->readyAndUpdate();
+            });
+        }
     }
 
     gameMenu->insertMenu(playersSeparator, newPlayer->getPlayerMenu());