Applied the fix for password warning to the dev branch.

Hi Dave,

I hope this is what you had in mind.

Cheers!