Revised patch for more password entropy
Merge pull request #4769 from alanfairless/more-password-entropy-revised

Revised patch for more password entropy