Add email annotation and validator to validate email fields