Validations on user at a pretty-good, uniform point
Merge branch 'paul'