diff --git a/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java b/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java
index 59777450158..36dffa859db 100644
--- a/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java
+++ b/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java
@@ -232,6 +232,7 @@ public void beforeSend(ServerSession session, Transaction tx, Message message, b
             message.putStringProperty(MessageConstants.HEADER_KAPUA_SESSION, Base64.getEncoder().encodeToString(SerializationUtils.serialize(sessionContext.getKapuaSession())));
             message.putLongProperty(MessageConstants.HEADER_KAPUA_RECEIVED_TIMESTAMP, KapuaDateUtils.getKapuaSysDate().getEpochSecond());
             message.putStringProperty(MessageConstants.HEADER_KAPUA_MESSAGE_TYPE, getMessgeType(address));
+            message.putStringProperty(MessageConstants.HEADER_KAPUA_ACCOUNT_NAME, sessionContext.getAccountName());
             if (!sessionContext.isInternal()) {
                 if (isLwt(address)) {
                     //handle the missing message case
diff --git a/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java b/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java
index 59d7d79a3e6..4dcc7e7eefc 100644
--- a/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java
+++ b/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java
@@ -36,6 +36,7 @@ private MessageConstants() {
     public static final String HEADER_KAPUA_BROKER_CONTEXT = "KAPUA_BROKER_CONTEXT";
     public static final String HEADER_KAPUA_PROCESSING_EXCEPTION = "KAPUA_PROCESSING_EXCEPTION";
     public static final String HEADER_KAPUA_MESSAGE_TYPE = "KAPUA_MESSAGE_TYPE";
+    public static final String HEADER_KAPUA_ACCOUNT_NAME = "HEADER_KAPUA_ACCOUNT_NAME";
 
     public static final String HEADER_CAMEL_JMS_HEADER_TIMESTAMP = "JMSTimestamp";
     public static final String HEADER_CAMEL_JMS_HEADER_DESTINATION = "JMSDestination";