diff --git a/checkin_notes b/checkin_notes
index aa5b07f4fd..ff1f23162e 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -601,3 +601,11 @@ Reinhard 15 Jan 2007
 
     client/
 	Makefile.am
+
+David  15 Jan 2007
+	- fix Manager text (see above)
+
+	clientgui/
+		ProjectProcessingPage.cpp
+	lib/
+		error_numbers.h
diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp
index 34922ad825..e62cb070f4 100644
--- a/clientgui/ProjectProcessingPage.cpp
+++ b/clientgui/ProjectProcessingPage.cpp
@@ -363,6 +363,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
     wxTimeSpan tsExecutionTime;
     bool bPostNewEvent = true;
     int iReturnValue = 0;
+	bool creating_account = false;
  
     wxASSERT(pDoc);
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
@@ -401,6 +402,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
 
                 if (pWAP->m_AccountInfoPage->m_pAccountCreateCtrl->GetValue()) {
                     pDoc->rpc.create_account(*ai);
+					creating_account = true;
 
                     // Wait until we are done processing the request.
                     dtStartExecutionTime = wxDateTime::Now();
@@ -456,7 +458,11 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
                 } else {
                     SetProjectCommunitcationsSucceeded(false);
 
-                    if ((ERR_DB_NON_UNIQUE == ao->error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTALREADYEXISTS)) {
+                    if ((ao->error_num == ERR_DB_NOT_UNIQUE)
+						|| (ao->error_num == ERR_NONUNIQUE_EMAIL)
+						|| (ao->error_num == ERR_BAD_PASSWD && creating_account)
+						|| CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTALREADYEXISTS)
+					) {
                         SetProjectAccountAlreadyExists(true);
                     } else {
                         SetProjectAccountAlreadyExists(false);
diff --git a/lib/error_numbers.h b/lib/error_numbers.h
index bd3ced7ffc..b129d90999 100755
--- a/lib/error_numbers.h
+++ b/lib/error_numbers.h
@@ -152,6 +152,7 @@
 #define ERR_IN_PROGRESS     -204
 #define ERR_BAD_EMAIL_ADDR  -205
 #define ERR_BAD_PASSWD      -206
+#define ERR_NONUNIQUE_EMAIL -207
 #define ERR_ACCT_CREATION_DISABLED  -208
 #define ERR_ATTACH_FAIL_INIT       -209
 #define ERR_ATTACH_FAIL_DOWNLOAD   -210