* Temporary fix for the client_id generation (fixes #8315) * Fix comment * Move client id setting. * Lint