Changes to get both oauth clients working
Merge