diff --git a/src/components/ChannelBanlist.vue b/src/components/ChannelBanlist.vue
index 1d7290c76..2a3b09458 100644
--- a/src/components/ChannelBanlist.vue
+++ b/src/components/ChannelBanlist.vue
@@ -1,9 +1,28 @@
 <template>
     <form class="u-form kiwi-channelbanlist" @submit.prevent="">
-        <a class="u-link" @click="updateBanlist">{{ $t('bans_refresh') }}</a>
+        <div v-if="areWeAnOp" class="kiwi-banlist-ban u-form">
+            <input
+                v-model="banMask"
+                type="text"
+                class="u-input"
+                placeholder="*!*@*"
+                @keydown="banKeyDown"
+            >
+            <a class="u-button u-button-secondary" @click="addBan()">
+                {{ $t('bans_add_ban') }}
+            </a>
+        </div>
+
+        <a
+            class="kiwi-banlist-refresh"
+            :class="{'u-link': !is_refreshing && !clickUpdateTimeout }"
+            @click="clickUpdateBanlist"
+        >
+            {{ $t('bans_refresh') }}
+        </a>
 
         <div
-            v-if="banlist.length > 0"
+            v-if="banList.length > 0"
             :class="{'kiwi-sidebar-settings-access-restricted': !areWeAnOp}"
             class="kiwi-sidebar-settings-access-table"
         >
@@ -12,12 +31,12 @@
             <div class="kiwi-sidebar-settings-access-table-header" />
             <div v-if="areWeAnOp" class="kiwi-sidebar-settings-access-table-header" />
 
-            <template v-for="ban in banlist">
+            <template v-for="ban in sortedBanList">
                 <div
                     :key="'mask' + ban.banned"
                     class="kiwi-sidebar-settings-access-mask"
                 >
-                    {{ ban.banned }}
+                    {{ displayMask(ban.banned) }}
                 </div>
                 <div
                     :key="'who' + ban.banned"
@@ -56,23 +75,65 @@
 <script>
 'kiwi public';
 
+import * as IrcdDiffs from '@/helpers/IrcdDiffs';
+import * as Misc from '@/helpers/Misc';
+
+const basicBanListSorter = (a, b) => {
+    if (a.banned_at === b.banned_at) {
+        return Misc.strCompare(a.banned, b.banned);
+    }
+
+    return b.banned_at - a.banned_at;
+};
+const getBanListSorter = (_extban) => {
+    if (!_extban) {
+        return basicBanListSorter;
+    }
+
+    const extbanColon = _extban + ':';
+    return (a, b) => {
+        const aAccount = a.banned.indexOf(extbanColon) === 0;
+        const bAccount = b.banned.indexOf(extbanColon) === 0;
+
+        if (aAccount && !bAccount) {
+            return -1;
+        }
+
+        if (!aAccount && bAccount) {
+            return 1;
+        }
+
+        return basicBanListSorter(a, b);
+    };
+};
+
 export default {
     props: ['buffer'],
     data() {
         return {
-            banlist: [],
+            banMask: '',
+            banList: [],
             is_refreshing: false,
+            clickUpdateTimeout: 0,
         };
     },
     computed: {
+        extban() {
+            return IrcdDiffs.extbanAccount(this.buffer.getNetwork());
+        },
         areWeAnOp() {
             return this.buffer.isUserAnOp(this.buffer.getNetwork().nick);
         },
+        sortedBanList() {
+            const sorter = getBanListSorter(this.extban);
+            return this.banList.slice().sort(sorter);
+        },
     },
     watch: {
         buffer() {
-            this.banlist = [];
+            this.banList = [];
             this.is_refreshing = false;
+            this.clickUpdateTimeout = 0;
             this.updateBanlist();
         },
     },
@@ -80,6 +141,20 @@ export default {
         this.updateBanlist();
     },
     methods: {
+        displayMask(banMask) {
+            return banMask.replace(this.extban + ':', '');
+        },
+        clickUpdateBanlist() {
+            if (this.clickUpdateTimeout) {
+                return;
+            }
+
+            this.clickUpdateTimeout = setTimeout(() => {
+                this.clickUpdateTimeout = 0;
+            }, 4000);
+
+            this.updateBanlist();
+        },
         updateBanlist() {
             if (this.is_refreshing || this.buffer.getNetwork().state !== 'connected') {
                 return;
@@ -99,14 +174,31 @@ export default {
                     return;
                 }
 
-                this.banlist = event.bans;
+                this.banList = event.bans;
                 this.is_refreshing = false;
             });
         },
+        addBan() {
+            const mask = this.banMask.trim();
+            if (!mask) {
+                return;
+            }
+            const ircClient = this.buffer.getNetwork().ircClient;
+            ircClient.ban(this.buffer.name, mask);
+
+            this.banMask = '';
+            this.updateBanlist();
+        },
         removeBan(mask) {
             const channelName = this.buffer.name;
             this.buffer.getNetwork().ircClient.unban(channelName, mask);
-            this.banlist = this.banlist.filter((ban) => ban.banned !== mask);
+            this.banList = this.banList.filter((ban) => ban.banned !== mask);
+        },
+        banKeyDown(event) {
+            if (event.key === 'Enter') {
+                event.preventDefault();
+                this.addBan();
+            }
         },
     },
 };
@@ -119,4 +211,19 @@ export default {
     row-gap: 10px;
     margin: 10px 0;
 }
+
+.kiwi-banlist-refresh:not(.u-link) {
+    cursor: default;
+}
+
+.kiwi-banlist-ban {
+    display: flex;
+    width: 100%;
+    box-sizing: border-box;
+
+    > input {
+        flex-grow: 1;
+        margin-right: 10px;
+    }
+}
 </style>
diff --git a/src/components/ChannelInfo.vue b/src/components/ChannelInfo.vue
index 7ba337a57..7901300ab 100644
--- a/src/components/ChannelInfo.vue
+++ b/src/components/ChannelInfo.vue
@@ -117,9 +117,6 @@ export default {
         },
     },
     methods: {
-        updateBanList() {
-            this.buffer.getNetwork().ircClient.raw('MODE', this.buffer.name, '+b');
-        },
         setMode(mode, param) {
             this.buffer.getNetwork().ircClient.raw('MODE', this.buffer.name, mode, param);
         },
diff --git a/src/components/ChannelInvitelist.vue b/src/components/ChannelInvitelist.vue
index c0fe7d36f..26e764a57 100644
--- a/src/components/ChannelInvitelist.vue
+++ b/src/components/ChannelInvitelist.vue
@@ -35,15 +35,17 @@
                 v-if="supportsAccounts && knownAccounts.length > 0"
                 ref="autocomplete"
                 class="kiwi-invitelist-auto-complete"
+                items-per-page="5"
                 :items="knownAccounts"
                 :filter="inviteMaskOrAccount"
-                @selected="inviteSelected"
+                @selected="accountSelected"
             />
         </template>
 
         <a
-            class="u-link kiwi-invitelist-refresh"
-            @click="updateInvitelist"
+            class="kiwi-invitelist-refresh"
+            :class="{'u-link': !is_refreshing && !clickUpdateTimeout }"
+            @click="clickUpdateInvitelist"
         >
             {{ $t('invites_refresh') }}
         </a>
@@ -58,12 +60,12 @@
             <div class="kiwi-sidebar-settings-access-table-header" />
             <div v-if="areWeAnOp" class="kiwi-sidebar-settings-access-table-header" />
 
-            <template v-for="invite in inviteListAccounts.concat(inviteListNonAccounts)">
+            <template v-for="invite in sortedInviteList">
                 <div
                     :key="'mask' + invite.invited"
                     class="kiwi-sidebar-settings-access-mask"
                 >
-                    {{ displayMask(invite) }}
+                    {{ displayMask(invite.invited) }}
                 </div>
                 <div
                     :key="'who' + invite.invited"
@@ -94,13 +96,13 @@
                 </div>
             </template>
         </div>
-
-        <div v-if="is_refreshing">
+        <div v-else-if="is_refreshing">
             {{ $t('invites_refreshing') }}
         </div>
     </form>
 </template>
 <script>
+'kiwi public';
 
 import _ from 'lodash';
 import * as IrcdDiffs from '@/helpers/IrcdDiffs';
@@ -108,9 +110,25 @@ import * as Misc from '@/helpers/Misc';
 
 import AutoComplete from './AutoComplete';
 
-function inviteListSorter(a, b) {
-    return Misc.strCompare(a.invited, b.invited);
-}
+const getInviteListSorter = (_extban) => {
+    if (!_extban) {
+        return (a, b) => Misc.strCompare(a.invited, b.invited);
+    }
+
+    const extbanColon = _extban + ':';
+    return (a, b) => {
+        const aAccount = a.invited.indexOf(extbanColon) === 0;
+        const bAccount = b.invited.indexOf(extbanColon) === 0;
+
+        if (aAccount && !bAccount) {
+            return -1;
+        } else if (!aAccount && bAccount) {
+            return 1;
+        }
+
+        return Misc.strCompare(a.invited, b.invited);
+    };
+};
 
 export default {
     components: {
@@ -122,6 +140,7 @@ export default {
             inviteMaskOrAccount: '',
             inviteList: [],
             is_refreshing: false,
+            clickUpdateTimeout: 0,
         };
     },
     computed: {
@@ -131,26 +150,23 @@ export default {
         extban() {
             return IrcdDiffs.extbanAccount(this.buffer.getNetwork());
         },
-        inviteListAccounts() {
-            if (!this.supportsAccounts) {
-                return [];
-            }
-
-            return this.inviteList
-                .filter((i) => i.invited.indexOf(this.extban) === 0)
-                .sort(inviteListSorter);
-        },
-        inviteListNonAccounts() {
-            // Only filter extban invites if the server supports them.
-            const invites = (this.supportsAccounts)
-                ? this.inviteList.filter((i) => i.invited.indexOf(this.extban) !== 0)
-                : this.inviteList.slice();
-
-            return invites.sort(inviteListSorter);
-        },
         channelIsInviteOnly() {
             return typeof this.buffer.modes.i !== 'undefined';
         },
+        areWeAnOp() {
+            return this.buffer.isUserAnOp(this.buffer.getNetwork().nick);
+        },
+        sortedInviteList() {
+            const sorter = getInviteListSorter(this.extban);
+            return this.inviteList.slice().sort(sorter);
+        },
+        inviteListAccounts() {
+            const extbanColon = this.extban + ':';
+
+            return (this.supportsAccounts)
+                ? this.inviteList.filter((i) => i.invited.indexOf(extbanColon) === 0)
+                : [];
+        },
         anyRegisteredUserCanJoin() {
             if (!this.supportsAccounts) {
                 return false;
@@ -160,31 +176,27 @@ export default {
                 return false;
             }
 
-            let extban = this.extban;
+            const extbanColon = this.extban + ':';
+
             // Find any invite that only consists of the extban and nothing else. Eg. '~a:'
-            return !!this.inviteListAccounts.find((invite) => invite.invited === extban + ':');
-        },
-        areWeAnOp() {
-            return this.buffer.isUserAnOp(this.buffer.getNetwork().nick);
+            return this.inviteListAccounts.some((i) => i.invited === extbanColon);
         },
         knownAccounts() {
             // Get an array of every account name we're aware of on the network, excluding
             // the ones we already have in our invite list
-            let users = this.buffer.getNetwork().users;
-            let extban = this.extban;
-            let inviteAccountNames = this.inviteListAccounts.map((i) => {
-                let mask = i.invited;
-                return mask.replace(extban + ':', '');
-            });
+            const extbanColon = this.extban + ':';
+            const accountMapper = (invite) => invite.invited.replace(extbanColon, '');
+            const existingInviteAccounts = this.inviteListAccounts.map(accountMapper);
 
-            let accountUsers = [];
+            const users = this.buffer.getNetwork().users;
+            const accountUsers = [];
             Object.values(users).forEach((user) => {
-                if (user.account && inviteAccountNames.indexOf(user.account) === -1) {
+                if (user.account && !existingInviteAccounts.includes(user.account)) {
                     accountUsers.push(user);
                 }
             });
 
-            const mapper = (user) => {
+            const autocompleteMapper = (user) => {
                 let text = user.account;
                 if (user.account !== user.nick) {
                     text += ` (${user.nick})`;
@@ -192,13 +204,14 @@ export default {
                 return { text, user };
             };
 
-            return _.orderBy(accountUsers, ['account', 'nick']).map(mapper);
+            return _.orderBy(accountUsers, ['account', 'nick']).map(autocompleteMapper);
         },
     },
     watch: {
         buffer() {
-            this.banlist = [];
+            this.inviteList = [];
             this.is_refreshing = false;
+            this.clickUpdateTimeout = 0;
             this.updateInvitelist();
         },
     },
@@ -206,10 +219,20 @@ export default {
         this.updateInvitelist();
     },
     methods: {
-        displayMask(invite) {
-            let display = invite.invited.replace(this.extban + ':', '');
-            display = display || this.$t('invite_any_registered');
-            return display;
+        displayMask(inviteMask) {
+            return inviteMask.replace(this.extban + ':', '')
+                || this.$t('invite_any_registered');
+        },
+        clickUpdateInvitelist() {
+            if (this.clickUpdateTimeout) {
+                return;
+            }
+
+            this.clickUpdateTimeout = setTimeout(() => {
+                this.clickUpdateTimeout = 0;
+            }, 4000);
+
+            this.updateInvitelist();
         },
         updateInvitelist() {
             if (this.is_refreshing || this.buffer.getNetwork().state !== 'connected') {
@@ -241,7 +264,7 @@ export default {
             }
 
             const ircClient = this.buffer.getNetwork().ircClient;
-            const isMask = maskOrAccount.includes('@');
+            const isMask = maskOrAccount.includes('@') || maskOrAccount.includes(':');
 
             if (this.supportsAccounts && !isMask) {
                 ircClient.addInvite(this.buffer.name, `${this.extban}:${maskOrAccount}`);
@@ -263,19 +286,28 @@ export default {
         removeInviteOnly() {
             this.buffer.getNetwork().ircClient.mode(this.buffer.name, '-i');
         },
-        inviteSelected(_value, item) {
+        accountSelected(_value, item) {
             this.inviteMaskOrAccount = item.user.account;
         },
         inviteKeyDown(event) {
             if (!this.$refs.autocomplete) {
                 return;
             }
+            const autoComplete = this.$refs.autocomplete;
 
             if (event.key === 'Tab') {
-                this.$refs.autocomplete.selectCurrentItem();
                 event.preventDefault();
+                autoComplete.selectCurrentItem();
                 return;
             }
+
+            const selectedItem = autoComplete.selectedItem;
+            if (event.key === 'Enter' && selectedItem.user.account === this.inviteMaskOrAccount) {
+                event.preventDefault();
+                this.addInvite();
+                return;
+            }
+
             this.$refs.autocomplete.handleOnKeyDown(event);
         },
     },
@@ -306,6 +338,10 @@ export default {
     }
 }
 
+.kiwi-invitelist-refresh:not(.u-link) {
+    cursor: default;
+}
+
 .kiwi-invitelist-invite {
     display: flex;
     width: 100%;
diff --git a/src/components/SidebarSectionSettings.vue b/src/components/SidebarSectionSettings.vue
index af30df8ff..9e64a7bcb 100644
--- a/src/components/SidebarSectionSettings.vue
+++ b/src/components/SidebarSectionSettings.vue
@@ -238,6 +238,10 @@ export default {
         }
     }
 
+    .kiwi-sidebar-settings-access-when {
+        white-space: nowrap;
+    }
+
     .kiwi-sidebar-settings-access-actions {
         text-align: center;
         position: relative;
diff --git a/src/libs/state/BufferState.js b/src/libs/state/BufferState.js
index 497e9effe..a4dcf10ba 100644
--- a/src/libs/state/BufferState.js
+++ b/src/libs/state/BufferState.js
@@ -21,7 +21,7 @@ export default class BufferState {
         this.key = '';
         this.joined = false;
         this.enabled = true;
-        this.created_at = 0;
+        this.created_at = null;
         this.users = Object.create(null);
         this.modes = Object.create(null);
         this.flags = {
diff --git a/src/res/locales/app.dev.po b/src/res/locales/app.dev.po
index c514844cb..49f2e11b8 100644
--- a/src/res/locales/app.dev.po
+++ b/src/res/locales/app.dev.po
@@ -435,6 +435,10 @@ msgstr "Refreshing banlist..."
 msgid "bans_nobody"
 msgstr "Nobody is banned!"
 
+#: Add ban
+msgid "bans_add_ban"
+msgstr "Add ban"
+
 
 
 #: ChannelInvitelist $t('invites_')