diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 9b4a4b93cc3..f9b42209755 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -308,8 +308,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
             mSwitchUserPref.setOnPreferenceClickListener(this);
         }
         //TODO(b/261700461): remove preference for supervised user
-        //TODO(b/262371063): check whether multiple admins allowed, not for HSUM
-        if (mUserInfo.isMain() || mUserInfo.isGuest() || !UserManager.isHeadlessSystemUserMode()) {
+        if (mUserInfo.isMain() || mUserInfo.isGuest() || !UserManager.isMultipleAdminEnabled()) {
             removePreference(KEY_GRANT_ADMIN);
         }
         if (!mUserManager.isAdminUser()) { // non admin users can't remove users and allow calls
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 54d0b452246..ceef7690dc1 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -722,9 +722,7 @@ public class UserSettings extends SettingsPreferenceFragment
                                                     KEY_ADD_USER_LONG_MESSAGE_DISPLAYED,
                                                     true).apply();
                                         }
-                                        //TODO(b/262371063): check whether multiple admins allowed,
-                                        // not for HSUM
-                                        if (UserManager.isHeadlessSystemUserMode()) {
+                                        if (UserManager.isMultipleAdminEnabled()) {
                                             showDialog(DIALOG_GRANT_ADMIN);
                                         } else {
                                             showDialog(DIALOG_USER_PROFILE_EDITOR_ADD_USER);
diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
index 5cd513ee147..62846c1c87d 100644
--- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
@@ -684,11 +684,11 @@ public class UserDetailsSettingsTest {
     }
 
     @Test
-    public void initialize_userSelected_shouldShowGrantAdminPref_HSUM() {
+    public void initialize_userSelected_shouldShowGrantAdminPref_MultipleAdminEnabled() {
         setupSelectedUser();
-        ShadowUserManager.setIsHeadlessSystemUserMode(true);
+        ShadowUserManager.setIsMultipleAdminEnabled(true);
         mFragment.initialize(mActivity, mArguments);
-        assertTrue(UserManager.isHeadlessSystemUserMode());
+        assertTrue(UserManager.isMultipleAdminEnabled());
         verify(mFragment, never()).removePreference(KEY_GRANT_ADMIN);
     }
 
@@ -700,17 +700,17 @@ public class UserDetailsSettingsTest {
     }
 
     @Test
-    public void initialize_mainUserSelected_shouldShowGrantAdminPref_HSUM() {
+    public void initialize_mainUserSelected_shouldShowGrantAdminPref_MultipleAdminEnabled() {
         setupSelectedMainUser();
-        ShadowUserManager.setIsHeadlessSystemUserMode(true);
+        ShadowUserManager.setIsMultipleAdminEnabled(true);
         mFragment.initialize(mActivity, mArguments);
         verify(mFragment).removePreference(KEY_GRANT_ADMIN);
     }
 
     @Test
-    public void initialize_guestSelected_shouldNotShowGrantAdminPref_HSUM() {
+    public void initialize_guestSelected_shouldNotShowGrantAdminPref_MultipleAdminEnabled() {
         setupSelectedGuest();
-        ShadowUserManager.setIsHeadlessSystemUserMode(true);
+        ShadowUserManager.setIsMultipleAdminEnabled(true);
         mFragment.initialize(mActivity, mArguments);
         verify(mFragment).removePreference(KEY_GRANT_ADMIN);
     }