diff --git a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
index 90d4cc2..379a02b 100644
--- a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
@@ -33,7 +33,7 @@
     protected final UserManager mUm;
     protected final LockPatternUtils mLockPatternUtils;
 
-    protected final int mUserId = UserHandle.myUserId();
+    private final int mUserId = UserHandle.myUserId();
     protected final int mProfileChallengeUserId;
 
     /**
diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
index cd27dbb..8450577 100644
--- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
@@ -46,7 +46,7 @@
 
     @Override
     protected boolean hasEnrolledBiometrics() {
-        return mFaceManager.hasEnrolledTemplates(mUserId);
+        return mFaceManager.hasEnrolledTemplates(getUserId());
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
index 2fcff5c..0e1ccd7 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
@@ -45,12 +45,12 @@
 
     @Override
     protected boolean hasEnrolledBiometrics() {
-        return mFingerprintManager.hasEnrolledFingerprints(mUserId);
+        return mFingerprintManager.hasEnrolledFingerprints(getUserId());
     }
 
     @Override
     protected String getSummaryTextEnrolled() {
-        final int numEnrolled = mFingerprintManager.getEnrolledFingerprints(mUserId).size();
+        final int numEnrolled = mFingerprintManager.getEnrolledFingerprints(getUserId()).size();
         return mContext.getResources().getQuantityString(
                 R.plurals.security_settings_fingerprint_preference_summary,
                 numEnrolled, numEnrolled);
