diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index b1f07c211..9b3f5cf4f 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -7,7 +7,7 @@
     xmlns:label="OGo:label"
     >
   <md-dialog flex="50" flex-sm="80" flex-xs="100">
-    <md-toolbar ng-class="!acl.folder.getClassName || acl.folder.getClassName('bg')">
+    <md-toolbar ng-class="::acl.folderClassName()">
       <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">
diff --git a/UI/WebServerResources/js/Common/AclController.js b/UI/WebServerResources/js/Common/AclController.js
index 6c2bcc822..ee3be2a12 100644
--- a/UI/WebServerResources/js/Common/AclController.js
+++ b/UI/WebServerResources/js/Common/AclController.js
@@ -16,6 +16,7 @@
     vm.selectedUid = null;
     vm.userToAdd = '';
     vm.searchText = '';
+    vm.folderClassName = folderClassName;
     vm.templateName = templateName;
     vm.userFilter = userFilter;
     vm.closeModal = closeModal;
@@ -29,6 +30,13 @@
     vm.confirmation = { showing: false,
                         message: ''};
 
+    function folderClassName() {
+      if (angular.isFunction(folder.getClassName))
+        return folder.getClassName('bg');
+      else
+        return false;
+    }
+
     function templateName(user) {
       // Check if user is anonymous and if a specific template must be used
       var isAnonymous = $document[0].getElementById('UIxAnonymousUserRightsEditor') && user.$isAnonymous();
diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index b4d825c5b..d6a0fb2f9 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -172,6 +172,7 @@
                 stateMessage: message
               }
             })
+            .catch() // Cancel
             .finally(function() {
               vm.messageDialog = null;
             });
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 0fcff8174..8654b5bb6 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -55,6 +55,11 @@
         window.CKEDITOR.addCss('.cke_editable { font-size: ' + data.SOGoMailComposeFontSize + 'px; }');
       }
 
+      _.forEach(data.AuxiliaryMailAccounts, function (mailAccount) {
+        if (isNaN(parseInt(mailAccount.port)))
+          mailAccount.port = null;
+      });
+
       // We convert our list of autoReplyEmailAddresses/forwardAddress into a string.
       // We also convert our date objects into real date, otherwise we'll have strings
       // or undefined values and the md-datepicker does NOT like this.
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index 362375fae..be3cbe473 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -148,6 +148,8 @@
       }).then(function() {
         vm.preferences.defaults.AuxiliaryMailAccounts[index] = account;
         form.$setDirty();
+      }, function() {
+        // Cancel
       });
     };