Improved guest mode detection
Guest mode