Fixed relogin issues