Issue with MX Record Displaying incorrectly

So I have a wildcard SSL Cert.
I have installed this cert in my VPS WHM>>Service Configuration>>Manage Service SSL Certificates.
I have enabled Mail SNI.
My MX Records for this domain are as follows:
0 MX mail.example.com
10 MX example.com

The issue I am having is when my clients goto cPanel Home>>Email Accounts>>Setup Mail Client the incorrect settings are being displayed for the incoming and outgoing servers.

They see my servers FQDN Hostname mydesign.example.com and not mail.example.com

So far the only workaround I have found is to add my MX records to EACH domain. This is time consuming and not a realistic fix. Has anyone run into this or figured out how to edit these settings? I did see that there was a feature request that was implemented in Version 56 to do this, but I can not find where to edit this information.

WHM/cPanel version 56.0 (build 20)