SPF Issues for accounts on alternate IP address

Hello,

Having some issues with SPF records on user accounts that are set to use a secondary IP address. It appears the SPF DNS entry is adding the secondary IP address, but emails when they are sent from these accounts are coming from the CWP machine's primary address.

I've been having to go in manually with each account to update the SPF record to the machine's primary IP.

Is there a way that either when the SPF record is automatically created it will use the primary IP instead of the IP that is on the user account. Or that when a user sends mail, it uses their assigned IP address to send instead of the machines primary address.

Would like to not have to go into each new account to change this manually every time.