Update user schema (to avoid cherry picking)
Merge pull request #1248 from codecombat/master

Update user schema