diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
index 1be40da..eebf3f5 100644
--- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
@@ -155,6 +155,13 @@ public class GmsAccountPage extends SetupPage {
         return true;
     }
 
+    @Override
+    public boolean doNextAction() {
+        final boolean canSkip = canSkip();
+        // return true to force this page to handle the next action.
+        return !canSkip;
+    }
+
     @Override
     public void onFinishSetup() {