Client id migration

1 out of 2