Avoid locale cycling on password error (bug 1066985)
Merge pull request #290 from davidbgk/1066985-password-locale-cycling

Avoid locale cycling on password error (bug 1066985)