How can we improve WHMCS?

Looking to have at least the following merge fields to be made available for Admin Messages templates:
{$client_name}
{$client_first_name}
{$client_last_name}
{$client_company_name}

As it stands, you can't tell at a glance which customer the admin email received relates to unless you remember their client ID. You have to engage with the email to be able to tell whether you should be engaging at all, or if it's something urgent or can wait.