Merge pull request #4316 from enescakar2148/fix-password-validation