diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java
index 60fd0d2..1c1533c 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java
@@ -78,8 +78,8 @@ public class CyanogenServicesPage extends SetupPage {
         } else {
             if (!SetupWizardUtils.accountExists(mContext,
                     mContext.getString(R.string.cm_account_type))) {
-                launchCyanogenAccountSetup(context);
                 super.doLoadAction(context, action);
+                launchCyanogenAccountSetup(context);
             } else {
                 getCallbacks().onNextPage();
             }
diff --git a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
index acf271b..2d764d6 100644
--- a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
@@ -65,8 +65,8 @@ public class WifiSetupPage extends SetupPage {
 
     @Override
     public void doLoadAction(Activity context, int action) {
-        SetupWizardUtils.launchWifiSetup(context);
         super.doLoadAction(context, action);
+        SetupWizardUtils.launchWifiSetup(context);
     }
 
     @Override