diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
index 8b808dc..fe9c5c9 100644
--- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
@@ -75,8 +75,8 @@ public class GmsAccountPage extends SetupPage {
         if (action == Page.ACTION_PREVIOUS) {
             getCallbacks().onPreviousPage();
         } else {
-            super.doLoadAction(context, action);
             launchGmsAccountSetup(context);
+            super.doLoadAction(context, action);
         }
     }
 
diff --git a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
index 2d764d6..acf271b 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) {
-        super.doLoadAction(context, action);
         SetupWizardUtils.launchWifiSetup(context);
+        super.doLoadAction(context, action);
     }
 
     @Override