Switched from OpenID to OAuth2 + Other Updaes