update captcha save handling
Merge branch 'origin/feature-captcha'