diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index 61bebdf9170..eb5d714cbba 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -384,7 +384,11 @@ public class FingerprintEnroll extends SettingsActivity {
                 mContentView.findViewById(buttons[i]).setOnClickListener(this);
             }
 
-            LockPatternUtils utils = new LockPatternUtils(activity);
+            if (mToken == null) {
+                mToken = getActivity().getIntent().getByteArrayExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+            }
+
             if (mToken == null) {
                 // need to choose or confirm lock
                 updateStage(Stage.EnrollingOnboard);
diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java
index 78e5ec6c11f..749ac113ec4 100644
--- a/src/com/android/settings/FingerprintSettings.java
+++ b/src/com/android/settings/FingerprintSettings.java
@@ -315,6 +315,7 @@ public class FingerprintSettings extends SettingsActivity {
             if (KEY_FINGERPRINT_ADD.equals(key)) {
                 Intent intent = new Intent();
                 intent.setClassName("com.android.settings", FingerprintEnroll.class.getName());
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
                 stopFingerprint();
                 startActivityForResult(intent, ADD_FINGERPRINT_REQUEST);
             } else if (pref instanceof FingerprintPreference) {