diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3b1a3b3..b0290d0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,6 +19,8 @@
         android:versionCode="3"
         android:sharedUserId="android.uid.system">
 
+    <original-package android:name="com.cyanogenmod.account" />
+
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
     <uses-permission android:name="android.permission.STATUS_BAR" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index 8066ba4..6d05c26 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -81,6 +81,16 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
         if (savedInstanceState != null && savedInstanceState.containsKey("data")) {
             mSetupData.load(savedInstanceState.getBundle("data"));
         }
+        // Since this is a new component, we need to disable here if the user
+        // has already been through setup on a previous version.
+        try {
+            if (Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.USER_SETUP_COMPLETE) == 1) {
+                finishSetup();
+            }
+        } catch (Settings.SettingNotFoundException e) {
+            // Continue with setup
+        }
     }
 
     @Override