OAuth2 improvement