Validate emails a little harder

(And remove @ednapiranha's ungodly semicolon)