Improved validation and implemented email check