Fix the client ID