diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index dc0203be6..e669fb18d 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -301,6 +301,9 @@ K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
 
   restoreCollectionFolderViewConfig();
 
+  if ( kmkernel->firstStart() ) {
+    KMail::Util::launchAccountWizard( this );
+  }
   // must be the last line of the constructor:
   mStartupDone = true;
 }
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index e6644d856..3247bf60f 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -86,10 +86,6 @@ KMMainWin::KMMainWin(QWidget *)
   connect( mKMMainWidget, SIGNAL( captionChangeRequest(const QString&) ),
            SLOT( setCaption(const QString&) ) );
 
-  if ( kmkernel->firstStart() )
-  {
-    KMail::Util::launchAccountWizard( this );
-  }
   if ( kmkernel->firstInstance() )
     QTimer::singleShot( 200, this, SLOT( slotShowTipOnStart() ) );
 }