Revert "update_with_password doesn't change encrypted password when it is invalid"

This reverts commit 10235f9d7204128e0daf17715b96e65df8e26e7d.
Release 2.2.1 with fixes for 2.2.0 regressions