User email can be blank and nonunique
Merge branch 'master' into signup