Make sure we respect #10309 during account creation