Minor changes to social login, change user working on Android