incorporating brads code into password validator
Merge remote-tracking branch 'origin/master'