v4 Complex Mode Update Account Fixes