Return from onvalid captcha properly

addresses #1160