diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 471ffe52c..8398fba44 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1625,5 +1625,9 @@
   },
   "unblockUser": {
     "message": "Unblock user"
+  },
+  "settingsUnblockHeader": {
+    "message": "Blocked Users",
+    "description": "Shown in the settings page as the heading for the blocked user settings"
   }
 }
diff --git a/js/views/blocked_number_view.js b/js/views/blocked_number_view.js
index a7b23d80a..41b731635 100644
--- a/js/views/blocked_number_view.js
+++ b/js/views/blocked_number_view.js
@@ -1,7 +1,7 @@
 /* global BlockedNumberController: false */
 /* global Whisper: false */
 /* global storage: false */
-/* global $: false */
+/* global i18n: false */
 
 /* eslint-disable no-new */
 
@@ -30,7 +30,7 @@
       },
       render_attributes() {
         return {
-          blockedHeader: 'Blocked Users',
+          blockedHeader: i18n('settingsUnblockHeader'),
         };
       },
     });
@@ -47,6 +47,7 @@
         const number = (this.model && this.model.get('number')) || '-';
         return {
           number,
+          unblockMessage: i18n('unblockUser'),
         }
       },
       onUnblock() {
diff --git a/preload.js b/preload.js
index e7f5d6093..ebc8c6ceb 100644
--- a/preload.js
+++ b/preload.js
@@ -82,6 +82,12 @@ window.getMediaPermissions = () => ipc.sendSync('get-media-permissions');
 window.onUnblockNumber = number => ipc.send('on-unblock-number', number);
 
 ipc.on('on-unblock-number', (event, number) => {
+  // Unblock the number
+  if (window.BlockedNumberController) {
+    window.BlockedNumberController.unblock(number);
+  }
+
+  // Update the conversation
   if (window.ConversationController) {
     try {
       const conversation = window.ConversationController.get(number);
diff --git a/settings.html b/settings.html
index a16727e00..e042c74a0 100644
--- a/settings.html
+++ b/settings.html
@@ -37,7 +37,7 @@
 <script type='text/x-tmpl-mustache' id='blockedNumber'>
   <div class='blocked-number'>
     <div class='wordwrap'>{{ number }}</div>
-    <button class='grey unblock-button'>Unblock</button>
+    <button class='grey unblock-button'>{{ unblockMessage }}</button>
   </div>
 </script>
 <script type='text/x-tmpl-mustache' id='blockedUserSettings'>