updating username to user
Merge pull request #539 from continuuity/feature/fix-google-user-default

updating username to user