diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 6461b937003..5f587a973fd 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -579,7 +579,8 @@ public class ChooseLockGeneric extends SettingsActivity {
         private void removeAllFingerprintTemplatesAndFinish() {
             if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
                     && mFingerprintManager.getEnrolledFingerprints().size() > 0) {
-                mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
+                mFingerprintManager.remove(
+                        new Fingerprint(null, 0, 0, 0), mUserId, mRemovalCallback);
             } else {
                 finish();
             }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index d0fcda00319..5152ebe560a 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -84,7 +84,7 @@ public class FingerprintEnrollSidecar extends InstrumentedFragment {
             mFingerprintManager.setActiveUser(mUserId);
         }
         mFingerprintManager.enroll(mToken, mEnrollmentCancel,
-                0 /* flags */, mEnrollmentCallback, mUserId);
+                0 /* flags */, mUserId, mEnrollmentCallback);
         mEnrolling = true;
     }
 
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index f3a46dca48b..f8b9c5fb888 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -286,7 +286,6 @@ public class FingerprintSettings extends SubSettings {
             mUserId = getActivity().getIntent().getIntExtra(
                     Intent.EXTRA_USER_ID, UserHandle.myUserId());
 
-
             Activity activity = getActivity();
             mFingerprintManager = (FingerprintManager) activity.getSystemService(
                     Context.FINGERPRINT_SERVICE);
@@ -536,16 +535,17 @@ public class FingerprintSettings extends SubSettings {
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+                intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
             }
         }
 
         private void deleteFingerPrint(Fingerprint fingerPrint) {
-            mFingerprintManager.remove(fingerPrint, mRemoveCallback);
+            mFingerprintManager.remove(fingerPrint, mUserId, mRemoveCallback);
         }
 
         private void renameFingerPrint(int fingerId, String newName) {
-            mFingerprintManager.rename(fingerId, newName);
+            mFingerprintManager.rename(fingerId, mUserId, newName);
             updatePreferences();
         }