diff --git a/clientgui/wizards/BOINCBaseWizard.cpp b/clientgui/wizards/BOINCBaseWizard.cpp
index ad71b12724..317d8e27c2 100644
--- a/clientgui/wizards/BOINCBaseWizard.cpp
+++ b/clientgui/wizards/BOINCBaseWizard.cpp
@@ -18,7 +18,7 @@
 // 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 #if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "AlreadyExistsPage.h"
+#pragma implementation "BOINCBaseWizard.h"
 #endif
 
 #include "stdwx.h"
@@ -103,6 +103,11 @@ wxWizardPageEx* CBOINCBaseWizard::_PushPageTransition( wxWizardPageEx* pCurrentP
 /*!
  * Process Cancel Event
  */
+bool CBOINCBaseWizard::IsCancelInProgress() const
+{ 
+    return m_bCancelInProgress;
+}
+
 void CBOINCBaseWizard::ProcessCancelEvent( wxWizardExEvent& event )
 {
     _ProcessCancelEvent( event );
@@ -116,6 +121,10 @@ void CBOINCBaseWizard::_ProcessCancelEvent( wxWizardExEvent& event )
  * Button Controls
  */
 
+wxButton* CBOINCBaseWizard::GetNextButton() const { 
+    return m_btnNext;
+}
+
 void CBOINCBaseWizard::SimulateNextButton() {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_btnNext->GetId());
     event.SetEventObject(GetNextButton());
@@ -130,6 +139,10 @@ void CBOINCBaseWizard::DisableNextButton() {
     m_btnNext->Disable();
 }
 
+wxButton* CBOINCBaseWizard::GetBackButton() const {
+    return m_btnPrev;
+}
+
 void CBOINCBaseWizard::SimulateBackButton() {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_btnPrev->GetId());
     event.SetEventObject(GetNextButton());
diff --git a/clientgui/wizards/BOINCBaseWizard.h b/clientgui/wizards/BOINCBaseWizard.h
index 0213a0a282..25facddf02 100644
--- a/clientgui/wizards/BOINCBaseWizard.h
+++ b/clientgui/wizards/BOINCBaseWizard.h
@@ -55,17 +55,17 @@ public:
     std::stack<wxWizardPageEx*> m_PageTransition;
 
     /// Cancel Event Infrastructure
-    bool IsCancelInProgress() const { return m_bCancelInProgress ; }
+    bool IsCancelInProgress() const;
     void ProcessCancelEvent( wxWizardExEvent& event );
     virtual void _ProcessCancelEvent( wxWizardExEvent& event );
     bool m_bCancelInProgress;
 
     /// Button State Infrastructure
-    wxButton* GetNextButton() const { return m_btnNext ; }
+    wxButton* GetNextButton() const;
     void SimulateNextButton();
     void EnableNextButton();
     void DisableNextButton();
-    wxButton* GetBackButton() const { return m_btnPrev ; }
+    wxButton* GetBackButton() const;
     void SimulateBackButton();
     void EnableBackButton();
     void DisableBackButton();
diff --git a/clientgui/wizards/WizardAccountManager.cpp b/clientgui/wizards/WizardAccountManager.cpp
index 7be39cb9ca..d2f7777c6c 100644
--- a/clientgui/wizards/WizardAccountManager.cpp
+++ b/clientgui/wizards/WizardAccountManager.cpp
@@ -67,11 +67,13 @@ END_EVENT_TABLE()
  * CWizardAccountManager constructors
  */
 
-CWizardAccountManager::CWizardAccountManager( )
+CWizardAccountManager::CWizardAccountManager() :
+    CBOINCBaseWizard()
 {
 }
 
-CWizardAccountManager::CWizardAccountManager( wxWindow* parent, wxWindowID id, const wxPoint& pos )
+CWizardAccountManager::CWizardAccountManager( wxWindow* parent, wxWindowID id, const wxPoint& pos ) :
+    CBOINCBaseWizard(parent, id, wxEmptyString, wxNullBitmap, pos, wxDEFAULT_DIALOG_STYLE)
 {
     Create(parent, id, pos);
 }
diff --git a/clientgui/wizards/wizardex.h b/clientgui/wizards/wizardex.h
index e41cf3123c..5a93d30e27 100644
--- a/clientgui/wizards/wizardex.h
+++ b/clientgui/wizards/wizardex.h
@@ -47,7 +47,7 @@ public:
                  const wxBitmap& bitmap = wxNullBitmap,
                  const wxChar* resource = NULL);
 
-    bool Create(wxWizardEx *parent,
+    virtual bool Create(wxWizardEx *parent,
                 const wxBitmap& bitmap = wxNullBitmap,
                 const wxChar* resource = NULL);
 
@@ -176,6 +176,7 @@ public:
         Init();
         Create(parent, id, title, bitmap, pos, style);
     }
+
     bool Create(wxWindow *parent,
              int id = wxID_ANY,
              const wxString& title = wxEmptyString,