diff --git a/checkin_notes b/checkin_notes
index c33018456a..74170405ca 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12350,3 +12350,9 @@ Reinhard 	29 Sept 2005
 	m4/
 	   boinc_getsockopt.m4
 
+Rom    29 Sept 2005
+    - If somebody clicks the account manager menu item, they should get the
+        account manager wizard.
+        
+    clientgui/
+        MainFrame.cpp
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index eb448b18bd..eb8ab82e47 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -952,7 +952,7 @@ void CMainFrame::OnExit(wxCommandEvent& WXUNUSED(event)) {
 void CMainFrame::OnProjectsAttachToAccountManager(wxCommandEvent& WXUNUSED(event)) {
     wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnProjectsAttachToAccountManager - Function Begin"));
 
-    int                       iAnswer = 0;
+    int                       iAnswer = ID_CHANGE;
     wxString                  strTitle = wxEmptyString;
     CMainDocument*            pDoc = wxGetApp().GetDocument();
 
@@ -981,7 +981,7 @@ void CMainFrame::OnProjectsAttachToAccountManager(wxCommandEvent& WXUNUSED(event
             pDlgStatus->Destroy();
     }
 
-    if ((ID_UPDATE == iAnswer) || (ID_CHANGE == iAnswer)) {
+    if (((ID_UPDATE == iAnswer) || (ID_CHANGE == iAnswer)) && (wxID_CANCEL != iAnswer)) {
         CWizardAccountManager* pWizard = new CWizardAccountManager(this);
 
         wxString strName = wxEmptyString;