diff --git a/checkin_notes b/checkin_notes
index d0170a7510..0b23c37920 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1813,3 +1813,17 @@ David  14 Feb 2006
 
     client
         cs_statefile.C
+
+Rom    14 Feb 2006
+    - Bug Fix: After any of the wizards have been executed, recreate the
+        menus.
+    - Bug Fix: Call Fit() before setting focus to any of the controls.
+        Fit() messes up the input focus even though the control still
+        seems like it is selected and has focus.
+        
+    clientgui/
+        AccountInfoPage.cpp
+        AccountKeyPage.cpp
+        MainFrame.cpp
+        ProjectInfoPage.cpp
+        ProxyPage.cpp
diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp
index 01f360c714..7654c70f3f 100644
--- a/clientgui/AccountInfoPage.cpp
+++ b/clientgui/AccountInfoPage.cpp
@@ -400,8 +400,8 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         m_pAccountPasswordRequirmentsStaticCtrl->SetLabel( str );
     }
  
-    m_pAccountEmailAddressCtrl->SetFocus();
     Fit();
+    m_pAccountEmailAddressCtrl->SetFocus();
 }
   
 /*!
diff --git a/clientgui/AccountKeyPage.cpp b/clientgui/AccountKeyPage.cpp
index c67476fcbf..8864d50ef9 100644
--- a/clientgui/AccountKeyPage.cpp
+++ b/clientgui/AccountKeyPage.cpp
@@ -232,8 +232,8 @@ void CAccountKeyPage::OnPageChanged( wxWizardExEvent& event ) {
         _("Account key:")
     );
 
-    m_pAccountKeyCtrl->SetFocus();
     Fit();
+    m_pAccountKeyCtrl->SetFocus();
 }
   
 /*!
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index 52331dce94..4d9b26d1cc 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -1106,6 +1106,8 @@ void CMainFrame::OnProjectsAttachToAccountManager(wxCommandEvent& WXUNUSED(event
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
         FireRefreshView();
 
         m_pRefreshStateTimer->Start();
@@ -1146,6 +1148,8 @@ void CMainFrame::OnAccountManagerUpdate(wxCommandEvent& WXUNUSED(event)) {
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
         FireRefreshView();
 
         m_pRefreshStateTimer->Start();
@@ -1186,6 +1190,8 @@ void CMainFrame::OnAccountManagerDetach(wxCommandEvent& WXUNUSED(event)) {
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
         FireRefreshView();
 
         m_pRefreshStateTimer->Start();
@@ -1230,6 +1236,9 @@ void CMainFrame::OnProjectsAttachToProject( wxCommandEvent& WXUNUSED(event) ) {
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
+
         m_pRefreshStateTimer->Start();
         m_pFrameRenderTimer->Start();
         m_pFrameListPanelRenderTimer->Start();
diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp
index 4d417ebcd5..2891181ba8 100644
--- a/clientgui/ProjectInfoPage.cpp
+++ b/clientgui/ProjectInfoPage.cpp
@@ -238,9 +238,8 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         wxT("http://boinc.berkeley.edu/")
     );
 
-    m_pProjectUrlCtrl->SetFocus();
-
     Fit();
+    m_pProjectUrlCtrl->SetFocus();
 }
   
 /*!
diff --git a/clientgui/ProxyPage.cpp b/clientgui/ProxyPage.cpp
index 803666675a..6dbb77e319 100644
--- a/clientgui/ProxyPage.cpp
+++ b/clientgui/ProxyPage.cpp
@@ -323,67 +323,64 @@ void CErrProxyPage::OnPageChanged( wxWizardExEvent& event ) {
     wxASSERT(m_pProxySOCKSPasswordStaticCtrl);
     wxASSERT(m_pProxySOCKSPasswordCtrl);
 
-    if (event.GetDirection() == true) {
-        // Moving from the previous page, update text and get state
+    // Moving from the previous page, update text and get state
 
-        m_pTitleStaticCtrl->SetLabel(
-            _("Proxy configuration")
-        );
-        m_pProxyHTTPDescriptionCtrl->SetLabel(
-            _("HTTP proxy")
-        );
-        m_pProxyHTTPServerStaticCtrl->SetLabel(
-            _("Server:")
-        );
-        m_pProxyHTTPPortStaticCtrl->SetLabel(
-            _("Port:")
-        );
-        m_pProxyHTTPUsernameStaticCtrl->SetLabel(
-            _("User Name:")
-        );
-        m_pProxyHTTPPasswordStaticCtrl->SetLabel(
-            _("Password:")
-        );
+    m_pTitleStaticCtrl->SetLabel(
+        _("Proxy configuration")
+    );
+    m_pProxyHTTPDescriptionCtrl->SetLabel(
+        _("HTTP proxy")
+    );
+    m_pProxyHTTPServerStaticCtrl->SetLabel(
+        _("Server:")
+    );
+    m_pProxyHTTPPortStaticCtrl->SetLabel(
+        _("Port:")
+    );
+    m_pProxyHTTPUsernameStaticCtrl->SetLabel(
+        _("User Name:")
+    );
+    m_pProxyHTTPPasswordStaticCtrl->SetLabel(
+        _("Password:")
+    );
 #if 0
-        m_pProxyHTTPAutodetectCtrl->SetLabel(
-            _("Autodetect")
-        );
+    m_pProxyHTTPAutodetectCtrl->SetLabel(
+        _("Autodetect")
+    );
 #endif
-        m_pProxySOCKSDescriptionCtrl->SetLabel(
-            _("SOCKS proxy")
-        );
-        m_pProxySOCKSServerStaticCtrl->SetLabel(
-            _("Server:")
-        );
-        m_pProxySOCKSPortStaticCtrl->SetLabel(
-            _("Port:")
-        );
-        m_pProxySOCKSUsernameStaticCtrl->SetLabel(
-            _("User Name:")
-        );
-        m_pProxySOCKSPasswordStaticCtrl->SetLabel(
-            _("Password:")
-        );
+    m_pProxySOCKSDescriptionCtrl->SetLabel(
+        _("SOCKS proxy")
+    );
+    m_pProxySOCKSServerStaticCtrl->SetLabel(
+        _("Server:")
+    );
+    m_pProxySOCKSPortStaticCtrl->SetLabel(
+        _("Port:")
+    );
+    m_pProxySOCKSUsernameStaticCtrl->SetLabel(
+        _("User Name:")
+    );
+    m_pProxySOCKSPasswordStaticCtrl->SetLabel(
+        _("Password:")
+    );
 
-        pDoc->GetProxyConfiguration();
-        m_pProxyHTTPServerCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str());
-        m_pProxyHTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str());
-        m_pProxyHTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str());
+    pDoc->GetProxyConfiguration();
+    m_pProxyHTTPServerCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str());
+    m_pProxyHTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str());
+    m_pProxyHTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str());
 
-        strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port);
-        m_pProxyHTTPPortCtrl->SetValue(strBuffer);
+    strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port);
+    m_pProxyHTTPPortCtrl->SetValue(strBuffer);
 
-        m_pProxySOCKSServerCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str());
-        m_pProxySOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str());
-        m_pProxySOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str());
+    m_pProxySOCKSServerCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str());
+    m_pProxySOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str());
+    m_pProxySOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str());
 
-        strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
-        m_pProxySOCKSPortCtrl->SetValue(strBuffer);
-
-        m_pProxyHTTPServerCtrl->SetFocus();
-    }
+    strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
+    m_pProxySOCKSPortCtrl->SetValue(strBuffer);
 
     Fit();
+    m_pProxyHTTPServerCtrl->SetFocus();
 }
  
 /*!