diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index 4e61aa6cd697b999fea9637d80d8142244aa9385..ba3fd9fff37d803f42731ce31c1b306f84f6f093 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -41,12 +41,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 544e432005ba667a6702a448e25febce821c1444..1e6b78fbf30fe47ab48b212825796431edca3139 100644
--- a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
+++ b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
@@ -44,7 +44,7 @@ public class FindMyDeviceActivity extends SubBaseActivity {
             onNavigateNext();
             return;
         }
-
+        setNextAllowed(true);
         setNextText(R.string.skip);
     }
 
@@ -61,7 +61,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 4a49f37b21a86356d03e3faa924484f39b347b8f..a62570d45da26b598d90bc92d47d5ef8acd95e58 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) {