Correct clientId is now used