diff --git a/clientgui/WelcomePage.cpp b/clientgui/WelcomePage.cpp
index 033c7cee24..33acfa140e 100644
--- a/clientgui/WelcomePage.cpp
+++ b/clientgui/WelcomePage.cpp
@@ -249,6 +249,7 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
     bool                   is_acct_mgr_detected = false;
     bool                   is_wcg_client = false;
     wxString               strBuffer = wxEmptyString;
+    CWizardAttach*         pWAP = ((CWizardAttach*)GetParent());
 
 
     wxASSERT(pDoc);
@@ -267,6 +268,8 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
 	std::string wcgUrl = "http://www.worldcommunitygrid.org/";
 	if ( pDoc->state.lookup_project(wcgUrl.c_str()) ) {
         is_wcg_client = true;
+        pWAP->IsAttachToProjectWizard = false;
+        pWAP->IsChangeWCGApps = true;
     }
 #endif
 
diff --git a/clientgui/WizardAttach.cpp b/clientgui/WizardAttach.cpp
index 82138238fe..ccdfef2ebf 100644
--- a/clientgui/WizardAttach.cpp
+++ b/clientgui/WizardAttach.cpp
@@ -119,14 +119,9 @@ bool CWizardAttach::Create( wxWindow* parent, wxWindowID id, const wxString& /*
  
     // Wizard Detection
 
-#if defined (_WCG)
-    IsAttachToProjectWizard = false;
-	IsChangeWCGApps = true;
-#else
     IsAttachToProjectWizard = true;
-	IsChangeWCGApps = false;
-	IsFirstPass = false;
-#endif
+    IsChangeWCGApps = false;
+    IsFirstPass = false;
     IsAccountManagerWizard = false;
     IsAccountManagerUpdateWizard = false;