#661 Added email and number validation to conditions