hopefully fix the endless waiting after login