Changed clientId -> userId