Correctly mark CAPTCHA fields as mandatory (see #7283)