Instead of creating pairs (my head is ready to explode, it's too small to handle this!), would it be easier to run the old code with each possible issuer? Once for the default, once for User.forceIssuer?