Issues With apple MFA, calls inbound dont show the correct DID in SIP field

[starr]

first came up, that Apple is calling the IT line of the customer and these calls are getting rejected as an Unidentified Incoming Call. Looking at the Pcap, I see that the Message header has the To: address as {number}@{IP} number is an unknown number, and so is the IP. We can let this pass, by adding the number into the DID of the trunk and it works, but I need to have the call identified by the "Request-URI User Part" which has the correct to number. The way this was explained form the SIP trunk support was that the number is a forwarded number.
If someone has the correct line I need to fix or add in the SIP template, that would be great!
this is my current setup


<field name="Source" custom="" parameter="ContactHost">$GWHostPort</field>

<field name="ParameterIn" custom="" parameter="ToUserPart">$CalledNum</field>

<field name="ParameterIn" custom="" parameter="FromDisplayName">$CallerName</field>

<field name="ParameterIn" custom="" parameter="FromUserPart">$CallerNum</field>

<field name="ParameterOut" custom="" parameter="RemotePartyIDCallingPartyHostPart">$GWHostPort</field>

<field name="ParameterOut" custom="" parameter="RequestLineURIUser">$CalledNum</field>

<field name="ParameterOut" custom="" parameter="RequestLineURIHost">$GWHostPort</field>

<field name="ParameterOut" custom="" parameter="ContactUser">$OutboundCallerId</field>

<field name="ParameterOut" custom="" parameter="ContactHost">$ContactUri</field>

<field name="ParameterOut" custom="" parameter="ToDisplayName">$CalledName</field>

<field name="ParameterOut" custom="" parameter="ToUserPart">$CalledNum</field>

<field name="ParameterOut" custom="" parameter="ToHostPart">$GWHostPort</field>

<field name="ParameterOut" custom="" parameter="FromDisplayName">$CallerDispName</field>

<field name="ParameterOut" custom="" parameter="FromUserPart">$OutboundCallerId</field>

<field name="ParameterOut" custom="" parameter="FromHostPart">$GWHostPort</field>

<field name="ParameterOut" custom="" parameter="RemotePartyIDCallingPartyDisplayName">$OutboundCallerId</field>

<field name="ParameterOut" custom="" parameter="RemotePartyIDCallingPartyUserPart">$OutboundCallerId</field>

 

[KyriacosS_3CX]

Hello,

Is this via a supported SIP Trunk provider, using the appropriate build in template?