Fixed userid/clientid mixup