Reorder ID init in Identity bootstrap