Merge pull request #869 from narfbg/develop-helpers-acc

Improve the captcha helper