fixing cases and bugs for unregistered users