diff --git a/res/raw/cm_wizard_script_user.xml b/res/raw/cm_wizard_script_user.xml
index 8be295a5..6a9fb191 100644
--- a/res/raw/cm_wizard_script_user.xml
+++ b/res/raw/cm_wizard_script_user.xml
@@ -17,11 +17,7 @@
 -->
 
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
-              wizard:firstAction="welcome">
-
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_WELCOME;end" id="welcome">
-        <result wizard:action="finish" />
-    </WizardAction>
+              wizard:firstAction="finish">
 
     <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
         <result wizard:action="exit" />
diff --git a/src/com/cyanogenmod/setupwizard/FingerprintActivity.java b/src/com/cyanogenmod/setupwizard/FingerprintActivity.java
index 332f8dcc..b7c678b5 100644
--- a/src/com/cyanogenmod/setupwizard/FingerprintActivity.java
+++ b/src/com/cyanogenmod/setupwizard/FingerprintActivity.java
@@ -37,7 +37,7 @@ public class FingerprintActivity extends SubBaseActivity {
 
     @Override
     protected void onStartSubactivity() {
-        setNextText(R.string.skip);
+        setNextAllowed(true);
         findViewById(R.id.setup_fingerprint).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/src/com/cyanogenmod/setupwizard/ScreenLockActivity.java b/src/com/cyanogenmod/setupwizard/ScreenLockActivity.java
index 1dc3ee3e..7b53f7dc 100644
--- a/src/com/cyanogenmod/setupwizard/ScreenLockActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ScreenLockActivity.java
@@ -31,7 +31,7 @@ public class ScreenLockActivity extends SubBaseActivity {
 
     @Override
     protected void onStartSubactivity() {
-        setNextText(R.string.skip);
+        setNextAllowed(true);
         findViewById(R.id.setup_lockscreen).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/src/com/cyanogenmod/setupwizard/SubBaseActivity.java b/src/com/cyanogenmod/setupwizard/SubBaseActivity.java
index c4ade65d..ae44a698 100644
--- a/src/com/cyanogenmod/setupwizard/SubBaseActivity.java
+++ b/src/com/cyanogenmod/setupwizard/SubBaseActivity.java
@@ -48,10 +48,10 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
         }
         super.onCreate(savedInstanceState);
         setNextText(R.string.skip);
+        setNextAllowed(false);
         if (savedInstanceState == null) {
             onStartSubactivity();
         }
-        setNextAllowed(false);
     }
 
     @Override