Merge pull request #1252 from public/fix-1235

Raise ValueError if the password doesn't fit