Fix reauth scenario