- Better handling of relogin