End devices - Phone - sometimes showing sip:xxxxxxxxx@myexternip instead of just XXX-XXX-XXXX

Hi all

freepbx 2.4.0 clean install, everything is working great, however I have a new behaviour that
did not occur previously on earlier versions.

Sometimes my end devices show a callerID as a sip string instead of just the CID number.
but it is not consistent, some calls do show as the numeric CID like you would expect.

sometimes showing sip:xxxxxxxxx@myexternip instead of just XXX-XXX-XXXX
while the same call to an analog phone behind an ATA shows the correct numeric CID
for the same call.

Is there some new option in ?zapata.conf or in one of the sip*.conf files thats set, or not set
that would cause this behaviour??

Thank you for any input

BRGds, Ted