diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index ff08264f0240c010b51497334166334bf72aa6bd..3a4b92888164c5f23fc62215f71bbacb6e822c4d 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -40,12 +40,12 @@ public class EAccountManagerActivity extends SubBaseActivity {
         if (LOGV) {
             logActivityState("onCreate savedInstanceState=" + savedInstanceState);
         }
+        setNextAllowed(true);
         setNextText(R.string.skip);
     }
 
     @Override
     protected void onStartSubactivity() {
-        setNextAllowed(true);
         findViewById(R.id.sign_in).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
index bb9a36805319112bba2ff94dd9b4472c29b3f5e9..54b3c681280f774c85e4abc626614a95c17196a5 100644
--- a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
+++ b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
@@ -43,7 +43,7 @@ public class FindMyDeviceActivity extends SubBaseActivity {
             onNavigateNext();
             return;
         }
-        
+        setNextAllowed(true);
         setNextText(R.string.skip);
     }
 
@@ -59,7 +59,6 @@ public class FindMyDeviceActivity extends SubBaseActivity {
 
     @Override
     protected void onStartSubactivity() {
-        setNextAllowed(true);
         findViewById(R.id.activate_find_my_device).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/src/org/lineageos/setupwizard/ParentalControlActivity.java b/src/org/lineageos/setupwizard/ParentalControlActivity.java
index aa9d4ebb8f3f43032e6a3bb64fce18d37106fc3b..645a11fd15cf730a7350b57d760796e5c6cbb2ce 100644
--- a/src/org/lineageos/setupwizard/ParentalControlActivity.java
+++ b/src/org/lineageos/setupwizard/ParentalControlActivity.java
@@ -30,12 +30,12 @@ public class ParentalControlActivity extends SubBaseActivity {
      @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setNextAllowed(true);
         setNextText(R.string.skip);
     }
 
     @Override
     protected void onStartSubactivity() {
-        setNextAllowed(true);
         findViewById(R.id.activate_parental_control).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {