Fixes #2120 Captcha while Login

Ignore the first 2 commits ;)