fix captcha
Merge branch 'master' into email

* master:
  fix captcha
password reset WIP