diff --git a/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
index 906f04f64..54124db96 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
@@ -15,7 +15,7 @@
           <div class="pseudo-input-field sg-md-title"><var:string value="calendar.displayName"/></div>
         </div>
         <md-button class="md-icon-button" ng-click="close()">
-          <md-icon aria-label="Close dialog">close</md-icon>
+          <md-icon label:aria-label="Close">close</md-icon>
         </md-button>
       </div>
     </md-toolbar>
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index a35fc5cfc..9eb77ce91 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -7,11 +7,16 @@
     xmlns:label="OGo:label"
     >
   <md-dialog flex="50" flex-sm="100">
-    <md-toolbar class="sg-padded">
-      <md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
-      <div class="pseudo-input-container">
-        <label class="pseudo-input-label"><var:string label:value="Access Rights"/></label>
-        <div class="pseudo-input-field sg-md-title">{{acl.folder.name}}</div>
+    <md-toolbar>
+      <div class="md-toolbar-tools">
+        <md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
+        <div class="pseudo-input-container md-flex">
+          <label class="pseudo-input-label"><var:string label:value="Access Rights"/></label>
+          <div class="sg-md-title">{{acl.folder.name}}</div>
+        </div>
+        <md-button class="md-icon-button" ng-click="acl.closeModal()">
+          <md-icon aria-label="Close dialog">close</md-icon>
+        </md-button>
       </div>
     </md-toolbar>
     <md-dialog-content>
@@ -69,6 +74,7 @@
           md-items="user in acl.userFilter(acl.searchText)"
           md-item-text="user.empty"
           md-min-length="3"
+          md-delay="300"
           md-no-cache="true"
           label:md-floating-label="Add User">
         <md-item-template>
@@ -82,8 +88,7 @@
           </span>
         </md-item-template>
       </md-autocomplete>
-      <md-button ng-click="acl.closeModal()"><var:string label:value="Cancel"/></md-button>
-      <md-button class="md-primitive" ng-click="acl.saveModal()"><var:string label:value="Save"/></md-button>
+      <md-button ng-click="acl.saveModal()"><var:string label:value="Save"/></md-button>
     </div>
   </md-dialog>
 
diff --git a/UI/WebServerResources/js/Common/AclController.js b/UI/WebServerResources/js/Common/AclController.js
index bb6af295e..206b72130 100644
--- a/UI/WebServerResources/js/Common/AclController.js
+++ b/UI/WebServerResources/js/Common/AclController.js
@@ -71,8 +71,10 @@
     }
 
     function selectUser(user) {
-      // Check if it is a different user
-      if (vm.selectedUser != user) {
+      if (vm.selectedUser == user) {
+        vm.selectedUser = null;
+      }
+      else {
         vm.selectedUser = user;
         vm.selectedUser.$rights();
       }