DRY up user.rb.
Merge pull request #1530 from Gaelan/dry-users

DRY up user.rb.