Setup Fee displays without tax on frontend

Hi Tuan
We recently implemented a setup fee and I've noticed that although we have asked for the price to display including tax, the setup fee doesn't. So we have an exclusive setup and inclusive annual fee on the membership subscriptions page. Have looked in the configuration, but don't seem to find any other setting to to address this for the setup fee, only the global setting to display prices inclusive of tax, which is set to 'yes'.
On the sign-up page under payment information, both prices are shown exclusive and the tax separately, which is fine, but in South Africa we have to advertise prices inclusive of VAT, and it becomes confusing if one price is exclusive and the other inclusive on the membership subscriptions page.
I've added screenshots of the pricings on the two pages.
Thanks,
Alison