Proper email validator fix, reverts 2b10f3d1437d5ff52fc5b2c7eb4b2879bd575006
refs #411