diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index fb9068e2..dd6e02ed 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -86,12 +86,12 @@
       rabbitmq_user:
         user: "{{ _oslomsg_notify_userid }}"
         password: "{{ _oslomsg_notify_password }}"
+        update_password: always
         vhost: "{{ _oslomsg_notify_vhost }}"
         configure_priv: ".*"
         read_priv: ".*"
         write_priv: ".*"
         state: "present"
-        force: true
       no_log: true
       when:
         - (_oslomsg_rpc_userid is undefined) or