Fixed lifetime issue with Oauth