Fix an issue where ids weren't being checked/used correctly in the client and tracker