Add Email validation, and optional validation to fields