Fix for add/remove accounts in Widget Wizard