Connectedline feature problem with picked-up calls

Fresh install (PBX in a Flash, purple)- Asterisk 1.8.3.3 and piaf 2.9.0.5

I did the upgrade to 2.9.0.5 before creating any extensions etc.

I’ve set send rpid and trust rpid in the extension settings and Caller ID changes as expected, both when dialling, and on transfers.

However, on calls that get ‘picked up’, either via *8 or by directed pickup, the calling party sees “device”.

eg…

A calls B - A correctly sees B’s name.
C picks the call up

C gets A’s name, but A now sees “device” rather than C’s name.

These symptoms are mentioned in a blog post on here (http://www.freepbx.org/news/2011-02-06/more-progress-with-some-of-the-asterisk-1-8-features) but that post states they were fixed.

Any ideas anyone?

Cheers,
Andy.