Updated form with email validation