Set user_id field to google account name

- Set user_id field to google account name.
- Minor cleanups.