Vishv dev

Changes based on feedback on 'Google SignIn' branch.
Consider extracting this code into a function exported by a separate module so you can test it. It's only one line, but it's a line that's not tested.