Fix for logged-out users