diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 7f2b5de..7f32260 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -39,4 +39,9 @@
      <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
          autodetected from the Configuration. -->
     <bool name="config_showNavigationBar">true</bool>
+    
+    <!-- Maximum number of supported users -->
+    <bool name="config_enableMultiUserUI">true</bool>
+    <integer name="config_multiuserMaximumUsers">5</integer>
+    
 </resources>
diff --git a/system.prop b/system.prop
index 270309d..bc6b291 100644
--- a/system.prop
+++ b/system.prop
@@ -62,7 +62,3 @@ persist.sys.usb.config=mtp
 
 # add support for USB storage type
 persist.sys.isUsbOtgEnabled=1
-
-# multi-user support
-fw.max_users=5
-fw.show_multiuserui=1