diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index bf31386..fa30f09 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -42,6 +42,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceActivity.Header;
@@ -415,7 +416,7 @@
                 i = insertAccountsHeaders(target, headerIndex);
             } else if (id == R.id.user_settings) {
                 if (!UserHandle.MU_ENABLED
-                        || !getResources().getBoolean(R.bool.enable_user_management)
+                        || !UserManager.supportsMultipleUsers()
                         || Utils.isMonkeyRunning()) {
                     target.remove(header);
                 }
