diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
index d8fbabc..e4bb6a5 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
@@ -50,9 +50,6 @@ public class CMSetupWizardData extends AbstractSetupData {
             pages.add(new BluetoothSetupPage(mContext, this));
         }
         pages.add(new WelcomePage(mContext, this));
-        if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) {
-            pages.add(new FingerprintSetupPage(mContext, this));
-        }
         pages.add(new WifiSetupPage(mContext, this));
         if (SetupWizardUtils.hasTelephony(mContext)) {
             pages.add(new SimCardMissingPage(mContext, this)
@@ -72,6 +69,9 @@ public class CMSetupWizardData extends AbstractSetupData {
         if (!SetupWizardUtils.hasLeanback(mContext)) {
             pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
         }
+        if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) {
+            pages.add(new FingerprintSetupPage(mContext, this));
+        }
         pages.add(new CyanogenSettingsPage(mContext, this));
         pages.add(new OtherSettingsPage(mContext, this));
         pages.add(new DateTimePage(mContext, this));