diff --git a/account_manager.py b/account_manager.py
index 5cecb280077890a545502dc62bde1ec82395d3dd..b2b037e6d390ceddd1b5c3767755f8c49c2035af 100755
--- a/account_manager.py
+++ b/account_manager.py
@@ -44,10 +44,14 @@ else:
     print("Invalid state provided. Check the help menu.")
 
 if args.all is not None:
+if args.service == 'all':
     # send a broadcast message to all agents
         rc_rmq.publish_msg(
             {
                 "routing_key": f"{action}.{username}",
+                "props": pika.BasicProperties(
+                         correlation_id=corr_id, reply_to=callback_queue
+                         ),
                 "msg":  {"username": username, "action": action, "service": service},
             }
         )