diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index fe3ecd04..b3e2ef7a 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -57,6 +57,7 @@
     - name: Verify password changed
       command: "rabbitmqctl authenticate_user {{ _oslomsg_rpc_userid }} {{ _oslomsg_rpc_password }}"
       register: rpc_password_changed
+      failed_when: false
 
     - name: Set password when changed
       command: "rabbitmqctl change_password {{ _oslomsg_rpc_userid }} {{ _oslomsg_rpc_password }}"
@@ -96,9 +97,21 @@
         read_priv: ".*"
         write_priv: ".*"
         state: "present"
-        force: true
+        force: false
       no_log: true
 
+    - name: Verify password changed
+      command: "rabbitmqctl authenticate_user {{ _oslomsg_notify_userid }} {{ _oslomsg_notify_password }}"
+      register: notify_password_changed
+      failed_when: false
+      when: _oslomsg_notify_userid != _oslomsg_rpc_userid
+
+    - name: Set password when changed
+      command: "rabbitmqctl change_password {{ _oslomsg_notify_userid }} {{ _oslomsg_notify_password }}"
+      when:
+        - notify_password_changed.rc | default(0) != 0
+        - _oslomsg_notify_userid != _oslomsg_rpc_userid
+
 - name: Setup RPC MQ Service (Qdrouterd)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"
   when: