Fix two minor bugs in recent AllowAccount work