diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp
index fd865d0da..9e4cbdefe 100644
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -34,7 +34,7 @@ OwncloudSetupWizard::OwncloudSetupWizard( FolderMan *folderMan, Theme *theme, QO
     _checkInstallationRequest(0),
     _folderMan(folderMan)
 {
-    _ocWizard = new OwncloudWizard;
+    _ocWizard = new OwncloudWizard();
 
     connect( _ocWizard, SIGNAL(connectToOCUrl( const QString& ) ),
              this, SLOT(slotConnectToOCUrl( const QString& )));
@@ -49,7 +49,7 @@ OwncloudSetupWizard::OwncloudSetupWizard( FolderMan *folderMan, Theme *theme, QO
 
 OwncloudSetupWizard::~OwncloudSetupWizard()
 {
-    // delete _ocWizard; FIXME: this crashes!
+    _ocWizard->deleteLater();
 }
 
 OwncloudWizard *OwncloudSetupWizard::wizard() {
diff --git a/src/mirall/owncloudwizard.h b/src/mirall/owncloudwizard.h
index feea746c5..ceccf1209 100644
--- a/src/mirall/owncloudwizard.h
+++ b/src/mirall/owncloudwizard.h
@@ -110,7 +110,7 @@ public:
       LogParagraph
     };
 
-    OwncloudWizard(QWidget *parent = 0L);
+    OwncloudWizard(QWidget *parent = 0);
 
     void setOCUrl( const QString& );
     void setOCUser( const QString& );