Better handle signed out users