Attempt to fix critical can't-make-new-accounts bug