CUC system handler with dispatch

Hello,

I have the following scenario:

calls are being forwarded to a system handler which takes the message and sends it to a distribution list. I want to play the ANI of the caller at message playback but instead of the caller's ANI I hear the System handler name. This happens if I call from a PSTn number. If I call from another subscriber into the system handler than it plays the name of the subscriber.

Any ideas?

Thanks