diff --git a/background.html b/background.html
index a7a201643..909e38813 100644
--- a/background.html
+++ b/background.html
@@ -258,8 +258,8 @@
       <!-- Request Received -->
       <div class="requestReceivedView" style="display: none;">
         <h4>{{ requestReceivedTitle }}</h4>
-        Please verify that the pubkey shown here is your secondary device pubkey!
-        <p class="secondaryPubKey"></p>
+        Please verify that the secret words shown below matches the ones on your other device!
+        <p class="secretWords"></p>
         <div class='buttons'>
           <button class="skip">{{ skipText }}</button>
           <button id="allowPairing">{{ allowPairingText }}</button>
@@ -270,7 +270,7 @@
       <div class="requestAcceptedView" style="display: none;">
         <h4>{{ requestAcceptedTitle }}</h4>
         Sending pairing authorisation to:
-        <p class="secondaryPubKey"></p>
+        <p class="secretWords"></p>
         <p class="transmissionStatus">Please be patient...</p>
         <div class='buttons'>
           <button class="ok" style="display: none;">{{ okText }}</button>
diff --git a/js/views/device_pairing_dialog_view.js b/js/views/device_pairing_dialog_view.js
index 2e18ab1f4..b8235826d 100644
--- a/js/views/device_pairing_dialog_view.js
+++ b/js/views/device_pairing_dialog_view.js
@@ -74,7 +74,12 @@
         waitingForRequestView.hide();
         requestAcceptedView.show();
       } else if (this.pubKey) {
-        this.$('.secondaryPubKey').text(this.pubKey);
+        const secretWords = window.mnemonic
+          .mn_encode(this.pubKey.slice(2), 'english')
+          .split(' ')
+          .slice(-3)
+          .join(' ');
+        this.$('.secretWords').text(secretWords);
         requestReceivedView.show();
         waitingForRequestView.hide();
         requestAcceptedView.hide();
diff --git a/js/views/standalone_registration_view.js b/js/views/standalone_registration_view.js
index 673307a77..8a23bb12b 100644
--- a/js/views/standalone_registration_view.js
+++ b/js/views/standalone_registration_view.js
@@ -222,8 +222,14 @@
         countDownCallBack();
         this.pairingInterval = setInterval(countDownCallBack, 1000);
         const pubkey = textsecure.storage.user.getNumber();
+        const words = window.mnemonic
+          .mn_encode(pubkey.slice(2), 'english')
+          .split(' ')
+          .slice(-3)
+          .join(' ');
+
         this.$('.standalone-secondary-device #pubkey').text(
-          `Here is your pubkey:\n${pubkey}`
+          `Here is your secret:\n${words}`
         );
       } catch (e) {
         onError(e);
diff --git a/libloki/api.js b/libloki/api.js
index 6d9faa579..66e63458b 100644
--- a/libloki/api.js
+++ b/libloki/api.js
@@ -110,7 +110,9 @@
       'private'
     );
     const lokiProfile = conversation.getLokiProfile();
-    const profile = new textsecure.protobuf.DataMessage.LokiProfile(lokiProfile);
+    const profile = new textsecure.protobuf.DataMessage.LokiProfile(
+      lokiProfile
+    );
     const dataMessage = new textsecure.protobuf.DataMessage({
       profile,
     });
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index cd3628cd0..dcac219a0 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -715,7 +715,8 @@ $loading-height: 16px;
     background: $color-loki-green-gradient;
     border-radius: 100px;
 
-    &:disabled, &:disabled:hover {
+    &:disabled,
+    &:disabled:hover {
       background: $color-loki-dark-gray;
       cursor: default;
     }