diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 5e44df3ad4c..0f95cc0b7b8 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -67,6 +67,11 @@ public class ChooseLockGeneric extends PreferenceActivity {
             mKeyStore = KeyStore.getInstance();
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity());
 
+            // Defaults to needing to confirm credentials
+            final boolean confirmCredentials = getActivity().getIntent()
+                .getBooleanExtra(CONFIRM_CREDENTIALS, true);
+            mPasswordConfirmed = !confirmCredentials;
+
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
             }