Handle token lookup correctly in getClientRecord()