Tweaks to the OAuth2 Flow