diff --git a/checkin_notes b/checkin_notes
index 066715adf3..dee025074d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6167,3 +6167,12 @@ Rom    18 Aug 2010
         BOINCHtmlLBox.cpp, .h
         BOINCVListBox.cpp, .h
         stdwx.h
+
+Rom    18 Aug 2010
+    - MGR: Finish implementing the use of Usernames in the account manager part
+        of the wizard.  I must have been asleep at the wheel on that one.
+        
+    clientgui/
+        AccountInfoPage.h
+        AccountManagerProcessingPage.cpp
+        ProjectProcessingPage.cpp
diff --git a/clientgui/AccountInfoPage.h b/clientgui/AccountInfoPage.h
index 8e740e6fb2..d007e9f4bc 100644
--- a/clientgui/AccountInfoPage.h
+++ b/clientgui/AccountInfoPage.h
@@ -80,6 +80,9 @@ public:
     wxString GetAccountConfirmPassword() const { return m_strAccountConfirmPassword ; }
     void SetAccountConfirmPassword(wxString value) { m_strAccountConfirmPassword = value ; }
 
+    wxString GetAccountUsername() const { return m_strAccountUsername ; }
+    void SetAccountUsername(wxString value) { m_strAccountUsername = value ; }
+
     /// Retrieves bitmap resources
     wxBitmap GetBitmapResource( const wxString& name );
 
diff --git a/clientgui/AccountManagerProcessingPage.cpp b/clientgui/AccountManagerProcessingPage.cpp
index 810b631ae9..f17222fd96 100644
--- a/clientgui/AccountManagerProcessingPage.cpp
+++ b/clientgui/AccountManagerProcessingPage.cpp
@@ -264,7 +264,11 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
                 url = (const char*)pWA->m_AccountManagerInfoPage->GetProjectURL().mb_str();
             }
 
-            username = (const char*)pWA->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
+            if (pWA->project_config.uses_username) {
+                username = (const char*)pWA->m_AccountInfoPage->GetAccountUsername().mb_str();
+            } else {
+                username = (const char*)pWA->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
+            }
             password = (const char*)pWA->m_AccountInfoPage->GetAccountPassword().mb_str();
             
             // Wait until we are done processing the request.
diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp
index ec52b7c5de..2714c2d6f3 100644
--- a/clientgui/ProjectProcessingPage.cpp
+++ b/clientgui/ProjectProcessingPage.cpp
@@ -398,7 +398,12 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
                 SetProjectCommunitcationsSucceeded(true);
             } else {
                 // Setup initial values for both the create and lookup API
-                ai->email_addr = (const char*)pWA->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
+
+                if (pWA->project_config.uses_username) {
+                    ai->email_addr = (const char*)pWA->m_AccountInfoPage->GetAccountUsername().mb_str();
+                } else {
+                    ai->email_addr = (const char*)pWA->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
+                }
                 ai->passwd = (const char*)pWA->m_AccountInfoPage->GetAccountPassword().mb_str();
                 ai->user_name = (const char*)::wxGetUserName().mb_str();
                 if (ai->user_name.empty()) {