Method of differentiating products when no domain is supplied

With a typical web hosting package a domain is associated to each and WHMCS includes this domain in multiple places where the package is shown. For example:

1. When viewing the Producs/Services tab of any given client, the drop down shows the domain to the right of the product
2. When invoicing a client, the domain is shown which is associated with the given line-item (package)

When a client has more than one of the exact same product, this works out great, because we can tell which package is which when administering their account and the client can tell which package is which when paying on their invoice(s).

However, when there is a product without a domain (such as a SHOUTcast account), there is no way to quickly and easily differentiate one identical product from the other in either of the two cases described above.

My feature request is to fall back to the username and show it instead everywhere a domain is currently shown whenever a domain is not present for the given product. This way I can tell which product I'm looking at when administering the account (without scanning through each manually to find the one I want) and my client knows which package they're paying on when completing payment on any given invoice.