fix #2412: login fail with unhelpful message on unvalidated account
Merge branch 'release' into upstream