diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts
index e9bcf660193..8316f1f30e7 100644
--- a/public/app/features/dashboard/acl/acl.ts
+++ b/public/app/features/dashboard/acl/acl.ts
@@ -45,9 +45,6 @@ export class AclCtrl {
 
   sortItems() {
     this.items = _.orderBy(this.items, ['sortRank', 'sortName'], ['desc', 'asc']);
-    for (let i of this.items) {
-      console.log(i.sortRank);
-    }
   }
 
   prepareViewModel(item: DashboardAcl): DashboardAcl {
@@ -69,9 +66,6 @@ export class AclCtrl {
       item.nameHtml = this.$sce.trustAsHtml(`Everyone with <span class="query-keyword">${item.role}</span> Role`);
       item.sortName = item.role;
       item.sortRank = 30;
-      if (item.role === 'Viewer') {
-        item.sortRank += 2;
-      }
       if (item.role === 'Viewer') {
         item.sortRank += 1;
       }
@@ -100,7 +94,7 @@ export class AclCtrl {
     }
 
     return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { items: updated }).then(() => {
-      this.dismiss();
+      return this.dismiss();
     });
   }
 
diff --git a/public/app/features/dashboard/acl/specs/acl_specs.ts b/public/app/features/dashboard/acl/specs/acl_specs.ts
index 7b26476719a..24f3e3eb61c 100644
--- a/public/app/features/dashboard/acl/specs/acl_specs.ts
+++ b/public/app/features/dashboard/acl/specs/acl_specs.ts
@@ -2,12 +2,16 @@ import {describe, beforeEach, it, expect, sinon, angularMocks} from 'test/lib/co
 import {AclCtrl} from '../acl';
 
 describe('AclCtrl', () => {
-  var ctx: any = {};
-  var backendSrv = {
+  const ctx: any = {};
+  const backendSrv = {
     get: sinon.stub().returns(Promise.resolve([])),
     post: sinon.stub().returns(Promise.resolve([]))
   };
 
+  const dashboardSrv = {
+    getCurrent: sinon.stub().returns({id: 1})
+  };
+
   beforeEach(angularMocks.module('grafana.core'));
   beforeEach(angularMocks.module('grafana.controllers'));
 
@@ -18,64 +22,59 @@ describe('AclCtrl', () => {
     ctx.ctrl = $controller(AclCtrl, {
       $scope: ctx.scope,
       backendSrv: backendSrv,
+      dashboardSrv: dashboardSrv
     }, {
-      dashboard: {id: 1}
+      dismiss: () => { return; }
     });
   }));
 
-  describe('when user permission is to be added', () => {
-    beforeEach(done => {
+  describe('when permissions are added', () => {
+    beforeEach(() => {
       backendSrv.get.reset();
       backendSrv.post.reset();
-      ctx.ctrl.type = 'User';
-      ctx.ctrl.userId = 2;
-      ctx.ctrl.permission = 1;
 
-      ctx.ctrl.addPermission().then(() => {
+      const userItem = {
+        id: 2,
+        login: 'user2',
+      };
+
+      ctx.ctrl.userPicked(userItem);
+
+      const userGroupItem = {
+        id: 2,
+        name: 'ug1',
+      };
+
+      ctx.ctrl.groupPicked(userGroupItem);
+
+      ctx.ctrl.newType = 'Editor';
+      ctx.ctrl.typeChanged();
+
+      ctx.ctrl.newType = 'Viewer';
+      ctx.ctrl.typeChanged();
+    });
+
+     it('should sort the result by role, user group and user', () => {
+        expect(ctx.ctrl.items[0].role).to.eql('Viewer');
+        expect(ctx.ctrl.items[1].role).to.eql('Editor');
+        expect(ctx.ctrl.items[2].userGroupId).to.eql(2);
+        expect(ctx.ctrl.items[3].userId).to.eql(2);
+      });
+
+    it('should save permissions to db', (done) => {
+      ctx.ctrl.update().then(() => {
         done();
       });
-    });
 
-    it('should parse the result and save to db', () => {
       expect(backendSrv.post.getCall(0).args[0]).to.eql('/api/dashboards/id/1/acl');
-      expect(backendSrv.post.getCall(0).args[1].userId).to.eql(2);
-      expect(backendSrv.post.getCall(0).args[1].permissions).to.eql(1);
-    });
-
-    it('should refresh the list after saving.', () => {
-      expect(backendSrv.get.getCall(0).args[0]).to.eql('/api/dashboards/id/1/acl');
-    });
-
-     it('should reset userId', () => {
-      expect(ctx.ctrl.userId).to.eql(null);
-    });
-  });
-
-  describe('when user group permission is to be added', () => {
-    beforeEach(done => {
-      backendSrv.get.reset();
-      backendSrv.post.reset();
-      ctx.ctrl.type = 'User Group';
-      ctx.ctrl.userGroupId = 2;
-      ctx.ctrl.permission = 1;
-
-      ctx.ctrl.addPermission().then(() => {
-        done();
-      });
-    });
-
-    it('should parse the result and save to db', () => {
-      expect(backendSrv.post.getCall(0).args[0]).to.eql('/api/dashboards/id/1/acl');
-      expect(backendSrv.post.getCall(0).args[1].userGroupId).to.eql(2);
-      expect(backendSrv.post.getCall(0).args[1].permissions).to.eql(1);
-    });
-
-    it('should refresh the list after saving.', () => {
-      expect(backendSrv.get.getCall(0).args[0]).to.eql('/api/dashboards/id/1/acl');
-    });
-
-     it('should reset userGroupId', () => {
-      expect(ctx.ctrl.userGroupId).to.eql(null);
+      expect(backendSrv.post.getCall(0).args[1].items[0].role).to.eql('Viewer');
+      expect(backendSrv.post.getCall(0).args[1].items[0].permission).to.eql(1);
+      expect(backendSrv.post.getCall(0).args[1].items[1].role).to.eql('Editor');
+      expect(backendSrv.post.getCall(0).args[1].items[1].permission).to.eql(1);
+      expect(backendSrv.post.getCall(0).args[1].items[2].userGroupId).to.eql(2);
+      expect(backendSrv.post.getCall(0).args[1].items[2].permission).to.eql(1);
+      expect(backendSrv.post.getCall(0).args[1].items[3].userId).to.eql(2);
+      expect(backendSrv.post.getCall(0).args[1].items[3].permission).to.eql(1);
     });
   });
 });