diff --git a/group_manager.py b/group_manager.py
index b2485a3f0b1306ccf575a9500688ea1c7d5c2162..66440b7dde3923d710f6e500370e464de4d23e8b 100755
--- a/group_manager.py
+++ b/group_manager.py
@@ -2,14 +2,13 @@
 import argparse
 import grp
 import json
-import os
 import pika
 import pwd
 import rabbit_config as rcfg
 import sys
 import uuid
 from rc_rmq import RCRMQ
-from rc_util import timeout
+from rc_util import get_caller_info, timeout
 
 
 # Instantiate rabbitmq object
@@ -40,6 +39,9 @@ def manage_group(op, usernames, groupname, debug=False):
     status = dict.fromkeys(usernames, False)
     response = 0
 
+    interface = "CLI"
+    executed_by, host = get_caller_info()
+
     def handler(ch, method, properties, body):
         if debug:
             print("Message received:")
@@ -75,6 +77,9 @@ def manage_group(op, usernames, groupname, debug=False):
                 "msg": {
                     "groups": {f"{op}": [f"{groupname}"]},
                     "username": user,
+                    "host": host,
+                    "executed_by": executed_by,
+                    "interface": interface,
                 },
             }
         )
@@ -109,8 +114,6 @@ if __name__ == "__main__":
     )
     args = parser.parse_args()
 
-    executed_by = os.getenv("USER")
-
     exist_users = []
     miss = False