better handling of logged out users