issue #20416: Fix so user account can save again.