Fix id references on user