JMSXUserID is not honoured with producer using AMQP protocol

There is a feature that ensure the JMSXUserID on a message was that as the user that was validated by broker. This is enabled by adding

<populate-validated-user>true</populate-validated-user>

to broker configuration.
This does not work when the producer is AMQP, as the validated user is no longer over-ridden on these messages.

The feature works if both producer and consumer use CORE protocol.