CALLERID referencing full number and not extension in initial [macro-user-callerid] call

[10slash01]

Looking for some assistance. I'm running Asterisk 18.15.1 and FreePBX/ClearlyIP 16.0.28.

I noticed that outbound caller id was always set to the Trunk ID using my SCCP extension. It works correctly on my SIP extension. I see that at the start of the call the [macro-user-callerid] is called to get CALLERID(number) and, in turn, uses this for AMPUSER. For my SIP extension, the CALLERID(number) returned is the extension - 3212. For the SCCP extension, the CALLERID(number) returned is the full 10-digit number. If I create the extension as the full 10 digit, the caller id works correctly; but, then, four-digit dial doesn't work.

Later in the log, it looks like the AMPUSER is using the full 10-digit, and, therefore, it doesn't exist when calling the database, so, it defaults to the Trunk caller id.

Am I doing something wrong that is causing the SCCP to send the full 10-digit while the SIP sends the extension in the initial extensions_additional.conf / macro-user-callerid?

Logs:

From my SIP: [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [xxx84242xx@from-internal:1] Macro("PJSIP/3212-0000000a", "user-callerid,LIMIT,EXTERNAL,") in new stack [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [s@macro-user-callerid:1] Set("PJSIP/3212-0000000a", "TOUCH_MONITOR=1672414705.23") in new stack [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [s@macro-user-callerid:2] Set("PJSIP/3212-0000000a", "CHANCONTEXT=") in new stack [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [s@macro-user-callerid:3] Set("PJSIP/3212-0000000a", "CHANCONTEXT=") in new stack [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [s@macro-user-callerid:4] Set("PJSIP/3212-0000000a", "CHANEXTENCONTEXT=3212-0000000a") in new stack [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [s@macro-user-callerid:5] Set("PJSIP/3212-0000000a", "CHANEXTEN=3212-0000000a") in new stack [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [s@macro-user-callerid:6] Set("PJSIP/3212-0000000a", "CALLERID(number)=3212") in new stack [2022-12-30 09:38:25] VERBOSE[139078][C-00000009] pbx.c: Executing [s@macro-user-callerid:7] Set("PJSIP/3212-0000000a", "AMPUSER=3212") in new stack

From my SCCP: [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [xxx84242xx@from-internal:1] Macro("SCCP/3213-00000007", "user-callerid,LIMIT,EXTERNAL,") in new stack [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [s@macro-user-callerid:1] Set("SCCP/3213-00000007", "TOUCH_MONITOR=1672416740.33") in new stack [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [s@macro-user-callerid:2] Set("SCCP/3213-00000007", "CHANCONTEXT=") in new stack [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [s@macro-user-callerid:3] Set("SCCP/3213-00000007", "CHANCONTEXT=") in new stack [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [s@macro-user-callerid:4] Set("SCCP/3213-00000007", "CHANEXTENCONTEXT=3213-00000007") in new stack [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [s@macro-user-callerid:5] Set("SCCP/3213-00000007", "CHANEXTEN=3213-00000007") in new stack [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [s@macro-user-callerid:6] Set("SCCP/3213-00000007", "CALLERID(number)=5552903213") in new stack [2022-12-30 10:12:21] VERBOSE[149400][C-0000000b] pbx.c: Executing [s@macro-user-callerid:7] Set("SCCP/3213-00000007", "AMPUSER=5552903213") in new stack