Add email validator and fix validator