better handle of guest sessions