diff --git a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
index 4f4aef0b0fae9..fa2ec55bd81a2 100644
--- a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
+++ b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
@@ -92,10 +92,7 @@ public class RestrictedLockUtils {
             if (admin.component != null) {
                 intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.component);
             }
-            final UserHandle adminUser = admin.user != null
-                    ? admin.user
-                    : UserHandle.of(UserHandle.myUserId());
-            intent.putExtra(Intent.EXTRA_USER, adminUser);
+            intent.putExtra(Intent.EXTRA_USER, admin.user);
         }
         return intent;
     }