Add validation for other field and email