Fix issue with logged-out user