Migrate Client ID to new system for API

1 out of 2