Guest Mode is one of the features that separate Android from the competition, allowing a single device to be used by multiple users (Windows Phone has a Kids mode, but doesn’t allow making separate user profiles.) Support for the feature was initially added on Android 4.2 Jelly Bean, but it was only available on tablets back then. With Android 5.0, Google brought Guest Mode to smartphones as well, but as it turns out, Samsung chose not to include the feature on any of the devices that it has updated to Lollipop.

The Galaxy S6 and Galaxy S6 edge are missing the feature as well, but we can confirm that it will be making an appearance with the Android 5.1 update for the two devices, and possibly other Samsung phones as well. We were able to play with an extremely early (and unstable) Android 5.1 build for the Galaxy S6 edge, and found Guest Mode works in the same way as it does on stock Android. Each user will have his/her own personal space, with the option to install their own apps, personalize their homescreen, and even secure their setup with their fingerprint.

Guest Mode is a pretty useful feature, even if it’s not one that most will ever need to use, so it’s great to see Samsung is bringing it to its smartphones (though the fact that it wasn’t there in the first place is a bit disappointing, especially since not every device might get the Android 5.1 update.) At this time there’s no telling when the Korean giant plans to roll out Android 5.1 for the Galaxy S6 and S6 edge, but as always, we will be doing our best to get you more details on the matter.

Would you use Guest Mode on your phone, or do you think it’s a feature that isn’t too important? Let us know in the comments!