Revert "friendly-invalid-password-prompt"

This reverts commit 9296c0717386a11921a178645be2b6a381aecd06.
Revert "Revert "friendly-invalid-password-prompt""

This reverts commit 05f15c7988acd7c9be883edf695905d97e04ffb9.