diff --git a/rabbitmq/defaults/main.yml b/rabbitmq/defaults/main.yml
index 9a655890..70abda0b 100644
--- a/rabbitmq/defaults/main.yml
+++ b/rabbitmq/defaults/main.yml
@@ -13,6 +13,8 @@ rabbitmq_disabled_plugins: ''
 rabbitmq_default_f: /etc/default/rabbitmq-server
 rabbitmq_fileno: 4096
 rabbitmq_admin_u: r_admin
+#rabbitmq_admin_pwd: use a vault file
+
 #
 # See http://www.rabbitmq.com/networking.html
 # 4369 (epmd), 25672 (Erlang distribution)
diff --git a/rabbitmq/tasks/main.yml b/rabbitmq/tasks/main.yml
index b1aef7bd..cc68618b 100644
--- a/rabbitmq/tasks/main.yml
+++ b/rabbitmq/tasks/main.yml
@@ -7,8 +7,7 @@
       apt_repository: repo='{{ rabbitmq_repo }}' state=present
 
     - name: Install the rabbitMQ package
-      apt: pkg={{ item }} state={{ rabbitmq_pkg_state }} update_cache=yes
-      with_items: '{{ rabbitmq_server_pkg }}'
+      apt: pkg={{ rabbitmq_server_pkg }} state={{ rabbitmq_pkg_state }} update_cache=yes
 
     - name: Set the rabbitMQ max files
       lineinfile: name={{ rabbitmq_default_f }} regexp="^ulimit" line="ulimit -n {{ rabbitmq_fileno }}"
@@ -18,7 +17,7 @@
       rabbitmq_plugin: names={{ rabbitmq_enabled_plugins }} state=enabled
   
     - name: Disable some rabbitMQ plugins
-      rabbitmq_plugin: names={{ rabbitmq_disabled_plugins | default('') }} state=disabled
+      rabbitmq_plugin: names={{ rabbitmq_disabled_plugins | default([]) }} state=disabled
 
     - name: Create an admin user
       rabbitmq_user: user={{ rabbitmq_admin_u }} password={{ rabbitmq_admin_pwd | default('changemeASAP') }} tags=administrator vhost=/ configure_priv=.* read_priv=.* write_priv=.* state=present