Login/Logout bugs