must update identity id appropriately