Better logged out user handling