Fix login for short passwords
Merge pull request #4221 from svbergerem/4123-fix-login-short-password

Fix login for short passwords