Working on Captcha integration - Issue #22