Fix broken captcha and use class