Change logout to logout_then_login