Some updates to password handling.