diff --git a/cockatrice/src/interface/intents/intent_login.cpp b/cockatrice/src/interface/intents/intent_login.cpp
index 344ef4e00..b4155a342 100644
--- a/cockatrice/src/interface/intents/intent_login.cpp
+++ b/cockatrice/src/interface/intents/intent_login.cpp
@@ -6,7 +6,8 @@
 
 #include <QDialog>
 
-IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context) : Intent(), context(_context)
+IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context, bool _promptForMissingCredentials)
+    : Intent(), context(_context), promptForMissingCredentials(_promptForMissingCredentials)
 {
 }
 
@@ -32,6 +33,14 @@ void IntentGetLoginCredentials::onPreconditionSatisfied()
 
 void IntentGetLoginCredentials::onPreconditionNotSatisfied()
 {
+    // MainWindow::applyStartupDestination runs this intent on every launch for
+    // users whose startup tab is Server / Server Room; keep that path quiet, as
+    // it was before the link-driven sign-in dialog existed.
+    if (!promptForMissingCredentials) {
+        emitFailed(tr("No saved credentials for this server"));
+        return;
+    }
+
     // No credentials saved for the target server: ask the user for them. They
     // opt into saving them so later links to the same server connect directly.
     const QString serverText = context->hostname + ":" + context->port;
diff --git a/cockatrice/src/interface/intents/intent_login.h b/cockatrice/src/interface/intents/intent_login.h
index c7fec92b7..8ffd91a0a 100644
--- a/cockatrice/src/interface/intents/intent_login.h
+++ b/cockatrice/src/interface/intents/intent_login.h
@@ -9,7 +9,10 @@ class IntentGetLoginCredentials : public Intent
     Q_OBJECT
 
 public:
-    IntentGetLoginCredentials(ContextConnectToServer *_context);
+    // When promptForMissingCredentials is false (the default) a server without
+    // saved credentials fails silently; only intent chains from cockatrice://
+    // links opt into the interactive sign-in dialog.
+    explicit IntentGetLoginCredentials(ContextConnectToServer *_context, bool _promptForMissingCredentials = false);
 
 protected:
     bool checkPrecondition() const override;
@@ -18,6 +21,7 @@ protected:
 
 private:
     ContextConnectToServer *context;
+    bool promptForMissingCredentials;
 };
 
 #endif // COCKATRICE_INTENT_LOGIN_H
diff --git a/cockatrice/src/interface/intents/url_parser.cpp b/cockatrice/src/interface/intents/url_parser.cpp
index ee5e084dd..f9a3fa70a 100644
--- a/cockatrice/src/interface/intents/url_parser.cpp
+++ b/cockatrice/src/interface/intents/url_parser.cpp
@@ -121,7 +121,7 @@ Intent *IntentUrlParser::createJoinGameIntent(const QUrlQuery &query, QList<Inte
 
     Intent *firstIntent = joinGameIntent;
     if (!isConnectedTo(serverContext->hostname, serverContext->port)) {
-        auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext);
+        auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext, /*promptForMissingCredentials=*/true);
         getLoginCredentialsIntent->setParent(joinGameIntent);
         chain.insert(0, getLoginCredentialsIntent);
 
@@ -238,7 +238,7 @@ Intent *IntentUrlParser::createOpenDeckIntent(const QUrlQuery &query, QList<Inte
 
     Intent *firstIntent = openDeckIntent;
     if (!isConnectedTo(serverContext->hostname, serverContext->port)) {
-        auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext);
+        auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext, /*promptForMissingCredentials=*/true);
         getLoginCredentialsIntent->setParent(openDeckIntent);
         chain.insert(0, getLoginCredentialsIntent);