diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 30f297cd3..fe51c9f83 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -146,6 +146,8 @@ define(req, function(AppConfig, Default, Language) {
         Messages.admin_addAdminsHint = "Add administrators from their public key or from your contacts list";
         Messages.admin_addAdminsAdd = "Promote a contact to admin";
         Messages.admin_addKeyLabel = "Add an admin using their public key";
+        Messages.admin_errorAddKeyLabel = "Add a valid public key";
+        Messages.admin_errorAddAdmins = "Pick a contact to promote to admin";
 
         Messages.admin_listName = "Admin name";
         Messages.admin_listKey = "Admin key";
diff --git a/www/admin/inner.js b/www/admin/inner.js
index d24a462fd..244b42c39 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -346,7 +346,9 @@ define([
             Util.onClickEnter($keyBtn, () => {
                 let val = $keyInput.val().trim();
                 let key = Keys.canonicalize(val);
-                if (!key) { return; }
+                if (!key) {
+                    return UI.warn(Messages.admin_errorAddKeyLabel);
+                }
                 // We have a valid key
                 let name = Messages.admin_admin;
                 try {
@@ -388,6 +390,9 @@ define([
                 let addBtn = blocks.button('primary', 'fa-plus', Messages.tag_add);
                 Util.onClickEnter($(addBtn), () => {
                     var $sel = $(contactsGrid.div).find('.cp-usergrid-user.cp-selected');
+                    if (!$sel.length) {
+                        return UI.warn(Messages.admin_errorAddAdmins);
+                    }
                     nThen((waitFor) => {
                         $sel.each((i, el) => {
                             const $el = $(el);
diff --git a/www/common/inner/sidebar-layout.js b/www/common/inner/sidebar-layout.js
index 03ce9c151..a356bffaf 100644
--- a/www/common/inner/sidebar-layout.js
+++ b/www/common/inner/sidebar-layout.js
@@ -64,7 +64,7 @@ define([
                 let prefix = icon.slice(0, icon.indexOf('-'));
                 cls = `.${prefix}.${icon}`;
             }
-            return h(`i${cls}`);
+            return h(`i${cls}`, { 'aria-hidden': 'true' });
         };
         blocks.button = (type, icon, text) => {
             type = type || 'primary';