Proper email validator fix, reverts b20d62e4e1ece3edc83dde047e2bd54d8af34b49
refs #486