How do I disable Safari-only mode?
You can disable the Guest account at startup in System Preferences -> Security &amp; Privacy -> Advanced (the button at the bottom of the screen. The checkbox says "Disable restarting to Safari when screen is locked". I believe that it leaves the iCloud settings unchanged.



This works without changing iCloud.