Extra check for non-preassigned badges

Adds a second check to make sure we don't assign numbers when we don't
need to.