Add a few more user fields
Merge pull request #1031 from ahinz/topic/more-user-fields

Add a few more user fields