diff --git a/checkin_notes b/checkin_notes
index 0db2a00255..aa278a8b9a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5610,3 +5610,9 @@ Charlie 12 June 2009
     mac_build/
         boinc.xcodeproj/
             project.pbxproj
+
+Charlie 13 June 2009
+    - MGR: Wizard retries acct_mgr_rpc() if acct_mgr_rpc_poll() sets ERR_RETRY.
+
+    clientgui/
+        AccountManagerProcessingPage.cpp
diff --git a/clientgui/AccountManagerProcessingPage.cpp b/clientgui/AccountManagerProcessingPage.cpp
index 847e4913d8..782a571217 100644
--- a/clientgui/AccountManagerProcessingPage.cpp
+++ b/clientgui/AccountManagerProcessingPage.cpp
@@ -282,11 +282,22 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
             tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
             iReturnValue = 0;
             reply.error_num = ERR_IN_PROGRESS;
-            while ((!iReturnValue && (ERR_IN_PROGRESS == reply.error_num)) &&
-                tsExecutionTime.GetSeconds() <= 60 &&
+            while (!iReturnValue && 
+                ((ERR_IN_PROGRESS == reply.error_num) || 
+                        (ERR_RETRY == reply.error_num)) &&
+                (tsExecutionTime.GetSeconds() <= 60) &&
                 !CHECK_CLOSINGINPROGRESS()
                 )
             {
+                if (ERR_RETRY == reply.error_num) {
+                    pDoc->rpc.acct_mgr_rpc(
+                        url.c_str(),
+                        username.c_str(),
+                        password.c_str(),
+                        pWAP->m_bCredentialsCached
+                    );
+                }
+            
                 dtCurrentExecutionTime = wxDateTime::Now();
                 tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
                 iReturnValue = pDoc->rpc.acct_mgr_rpc_poll(reply);