Migrate Client ID to new system for API

2 out of 2