Fix validation - don't require fields which might be hidden