Fixes fro captcha, made it optional