Fix userID counting in DeviceClient