Incorporate Don's Change ListTokensForUser method to support new findByClientIdAndUserID