Fix OAuth 2 token only

Fix some issues with the OAuth 2 implementation.