[WIP] better user sync

Do not merge.