diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ace204c..0412771 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,13 +56,10 @@
                   android:windowSoftInputMode="stateAlwaysHidden">
 
             <intent-filter android:priority="9">
-
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.DEVICE_INITIALIZATION_WIZARD" />
-
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
diff --git a/src/com/fairphone/setupwizard/SetupWizardApp.java b/src/com/fairphone/setupwizard/SetupWizardApp.java
index 8368765..eaea742 100644
--- a/src/com/fairphone/setupwizard/SetupWizardApp.java
+++ b/src/com/fairphone/setupwizard/SetupWizardApp.java
@@ -96,9 +96,10 @@
                 Thread t = new Thread(){
                     @Override
                     public void run() {
-                        Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
-                        Settings.Secure.putInt(getContentResolver(),
-                                Settings.Secure.USER_SETUP_COMPLETE, 1);
+                      Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
+                       Settings.Secure.putInt(getContentResolver(),
+                               Settings.Secure.USER_SETUP_COMPLETE, 1);
+                       SetupWizardUtils.disableSetupWizard(SetupWizardApp.this);
                     }
                 };
                 t.run();