From f8681347dd27d55152d2b85a84c435788f647f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Thu, 27 Aug 2026 13:06:21 +0200
Subject: [PATCH] [client] Arm the account prompt only from the wait that owns
 the flow

---
 client/server/server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/server/server.go b/client/server/server.go
index 24e6f350c..f94330176 100644
--- a/client/server/server.go
+++ b/client/server/server.go
@@ -1002,8 +1002,8 @@ func (s *Server) WaitSSOLogin(callerCtx context.Context, msg *proto.WaitSSOLogin
 			s.mutex.Lock()
 			if s.oauthAuthFlow.flow == flow {
 				s.oauthAuthFlow = oauthAuthFlow{}
+				s.forceAccountPrompt = true
 			}
-			s.forceAccountPrompt = true
 			s.mutex.Unlock()
 			state.Set(internal.StatusNeedsLogin)
 			return nil, gstatus.Errorf(codes.FailedPrecondition, "the login used a different account than this profile; connect again to choose the account")