index e5576a3..0bfc11c 100644
--- a/rpc_deployment/playbooks/infrastructure/rabbit-bootstrap.yml
+++ b/rpc_deployment/playbooks/infrastructure/rabbit-bootstrap.yml
@@ -18,3 +18,15 @@
   roles:
     - rabbit_user
     - rabbit_create_cluster
+  post_tasks:
+    # This is being done because the rabbitctl command used by the module
+    # is not very effective at returning proper status codes for failure
+    # and the module does not error detection. until we can go upstream
+    # to fix this issue this task being being done in two parts to ensure
+    # that the "guest" user is eradicated.
+    - name: Ensure default rabbitmq guest user is removed
+      rabbitmq_user:
+        user: guest
+        state: absent
+      tags:
+        - rabbit_user
diff --git a/rpc_deployment/playbooks/monitoring/maas_local.yml b/rpc_deployment/playbooks/monitoring/maas_local.yml
index 15e4656..e082529 100644
--- a/rpc_deployment/playbooks/monitoring/maas_local.yml
+++ b/rpc_deployment/playbooks/monitoring/maas_local.yml
@@ -304,7 +304,7 @@
 - hosts: rabbit
   vars:
     check_name: rabbitmq_status
-    check_details: file={{ check_name }}.py,args=-H,args={{ ansible_ssh_host }},args=-n,args={{ inventory_hostname.split('.')[0] }}
+    check_details: file={{ check_name }}.py,args=-H,args={{ ansible_ssh_host }},args=-n,args={{ inventory_hostname.split('.')[0] }},args=-U,args={{ rabbit_userid }},args=-p,args={{ rabbit_password }}
     check_period: "{{ maas_check_period }}"
     check_timeout: "{{ maas_check_timeout }}"
     alarms: