Fixing empty fields issue
Upgrading oauthtoken request handling