Make sure that we do the password hash only when we need to.