Small User model fixes.
Minor tweaks to the profile / settings routes.
Merge pull request #390 from benkonrath/adjustments

Adjustments