Improve password hits

Change-Id: Ic0a32693da2b6a12eaf7bc3ee904e523efb5b654