Improve ReCaptcha support