From ee47ac8ef914cb0e8ec0c72115824856c5001a19 Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Fri, 19 Feb 2016 18:11:31 -0500
Subject: [PATCH] MGR: When clicking next on the project welcome page, only go
 to the account info page if neither the authenticator or setup cookie are
 present.  Otherwise attempt to attach with either.

---
 clientgui/ProjectWelcomePage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clientgui/ProjectWelcomePage.cpp b/clientgui/ProjectWelcomePage.cpp
index 083c6042f4..4c0dcbbc0e 100644
--- a/clientgui/ProjectWelcomePage.cpp
+++ b/clientgui/ProjectWelcomePage.cpp
@@ -196,7 +196,7 @@ wxWizardPageEx* CProjectWelcomePage::GetNext() const
     if (CHECK_CLOSINGINPROGRESS()) {
         // Cancel Event Detected
         return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    } else if (pWA->GetProjectAuthenticator().IsEmpty()) {
+    } else if (pWA->GetProjectAuthenticator().IsEmpty() && pWA->GetProjectSetupCookie().IsEmpty()) {
         return PAGE_TRANSITION_NEXT(ID_ACCOUNTINFOPAGE);
     } else {
         return PAGE_TRANSITION_NEXT(ID_PROJECTPROCESSINGPAGE);