Bugfix OAuth issues