Fix OAuthAccessTokenId flow var after OAuth dance