Fix up more IDs for remove user