Fix OAuth/Multiauthentication  error.
Merge branch 'multi-authentication-fix'