diff --git a/pillar/gnuviechadmin/queues.sls b/pillar/gnuviechadmin/queues.sls
index 881ed57..c3fcabb 100644
--- a/pillar/gnuviechadmin/queues.sls
+++ b/pillar/gnuviechadmin/queues.sls
@@ -11,7 +11,16 @@ include:
 gnuviechadmin:
   queues:
     users:
-      ldap:
+      admin:
+        password: MmE3Iwylj8Sgy46Z
+        perms:
+            '/gnuviechadmin':
+              - '.*'
+              - '.*'
+              - '.*'
+        tags:
+          - administrator
+      cli:
         perms:
             '/gnuviechadmin':
               - '.*'
@@ -24,6 +33,7 @@ gnuviechadmin:
               - '.*'
               - '.*'
               - '.*'
+        tags:
       gva:
         perms:
             '/gnuviechadmin':
@@ -31,6 +41,13 @@ gnuviechadmin:
               - '.*'
               - '.*'
         tags:
+      ldap:
+        perms:
+            '/gnuviechadmin':
+              - '.*'
+              - '.*'
+              - '.*'
+        tags:
       mysql:
         perms:
             '/gnuviechadmin':
@@ -45,20 +62,6 @@ gnuviechadmin:
               - '.*'
               - '.*'
         tags:
-      web:
-        perms:
-            '/gnuviechadmin':
-              - '.*'
-              - '.*'
-              - '.*'
-        tags:
-      cli:
-        perms:
-            '/gnuviechadmin':
-              - '.*'
-              - '.*'
-              - '.*'
-        tags:
       quotajob:
         perms:
             '/gnuviechadmin':
@@ -66,12 +69,10 @@ gnuviechadmin:
               - '^quotatool$'
               - '^quotatool|amq.default$'
         tags:
-      admin:
-        password: MmE3Iwylj8Sgy46Z
+      web:
         perms:
             '/gnuviechadmin':
               - '.*'
               - '.*'
               - '.*'
         tags:
-          - administrator