Update Create/Update User operations according to latest API state