Adding captcha support (WiP)