Fix Client ID duplicate