Handle more empty fields
Contain user model for email address
Exit after error status instead of return, to skip rendering entirely
Merge remote-tracking branch 'upstream/master'