Issue 985 validate email