Fixing logOut bugs