Another fixes, moved captcha again