Merge branch 'feature/better-login-errors' into 'develop'