diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index eb3c748ee6e7e..468cfe0229c92 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -882,7 +882,9 @@ public class UserManager {
                 ++switchableUserCount;
             }
         }
-        return switchableUserCount > 1;
+        final boolean guestEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.GUEST_USER_ENABLED, 0) == 1;
+        return switchableUserCount > 1 || guestEnabled;
     }
 
     /**