diff --git a/salt/roots/gnuviechadmin/database.sls b/salt/roots/gnuviechadmin/database.sls
index 1323368..5e9c963 100644
--- a/salt/roots/gnuviechadmin/database.sls
+++ b/salt/roots/gnuviechadmin/database.sls
@@ -7,6 +7,9 @@ gnuviechadmin-database:
     - user: postgres
     - password: {{ salt['pillar.get']('gnuviechadmin-database:owner:password') }}
     - login: True
+    - createdb: {% if salt['pillar.get']('gnuviechadmin:deploymenttype', 'production') == 'local' %}True
+{%- else %}False
+{%- endif %}
     - require:
       - service: postgresql
   postgres_database.present:
diff --git a/salt/roots/gnuviechadmin/queues.sls b/salt/roots/gnuviechadmin/queues.sls
index 3a33604..e529dda 100644
--- a/salt/roots/gnuviechadmin/queues.sls
+++ b/salt/roots/gnuviechadmin/queues.sls
@@ -5,6 +5,13 @@ gnuviechadmin-queues:
   rabbitmq_user.present:
     - name: {{ salt['pillar.get']('gnuviechadmin-queues:owner:user') }}
     - password: {{ salt['pillar.get']('gnuviechadmin-queues:owner:password') }}
+    - tags:
+      - administrator
+    - perms:
+      - {{ salt['pillar.get']('gnuviechadmin-queues:vhost') }}:
+        - '.*'
+        - '.*'
+        - '.*'
   rabbitmq_vhost.present:
     - name: {{ salt['pillar.get']('gnuviechadmin-queues:vhost') }}
     - owner: {{ salt['pillar.get']('gnuviechadmin-queues:owner:user') }}
diff --git a/salt/roots/rabbitmq-server/init.sls b/salt/roots/rabbitmq-server/init.sls
index 32ac09f..6c3c7f6 100644
--- a/salt/roots/rabbitmq-server/init.sls
+++ b/salt/roots/rabbitmq-server/init.sls
@@ -9,3 +9,9 @@ rabbitmq-server:
 guest:
   rabbitmq_user:
     - absent
+
+rabbitmq_management:
+  rabbitmq_plugin:
+    - enabled
+    - watch_in:
+      - service: rabbitmq-server