Merge branch 'authenticate' into AddCaptcha