* cleaner version of the patch to make sure no double account-setup-wizards are