Display Username as well as "name" in passwords list

Right now I have to choose between "Naming" the password as what it is and having the password be the username. Sometimes when I'm searching for a password I know what the username is (Ex: admin@contoso.com) and so I'm looking for that, other times I don't know what the username is I'm just looking for what the credential is for (Ex: Office365 Global Admin). It would be nice if the password list displayed both the Name field you have now and the username field so that regardless of which piece of info I have I can browse to the password I'm looking for.