diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 4d0abdc848..d78ef3ca83 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -233,6 +233,7 @@ export default class DeviceVerifyDialog extends React.Component {
             sas={this._showSasEvent.sas}
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
+            isSelf={MatrixClientPeg.get().getUserId() === this.props.userId}
         />;
     }
 
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index 1221e0cb91..0095a0cb93 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -121,7 +121,7 @@ export default class IncomingSasDialog extends React.Component {
         const Spinner = sdk.getComponent("views.elements.Spinner");
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().credentials.userId;
+        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().getUserId();
 
         let profile;
         if (this.state.opponentProfile) {
@@ -196,6 +196,7 @@ export default class IncomingSasDialog extends React.Component {
             sas={this._showSasEvent.sas}
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
+            isSelf={this.props.verifier.userId == MatrixClientPeg.get().getUserId()}
         />;
     }
 
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 38bc1bb40a..b92e72c3a7 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -32,6 +32,7 @@ export default class VerificationShowSas extends React.Component {
         onDone: PropTypes.func.isRequired,
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,
+        isSelf: PropTypes.bool,
     };
 
     constructor(props) {
@@ -66,9 +67,13 @@ export default class VerificationShowSas extends React.Component {
                 <div className="mx_VerificationShowSas_emojiSas_break" />
                 {emojiBlocks.slice(4)}
             </div>;
-            sasCaption = _t(
-                "Verify this user by confirming the following emoji appear on their screen.",
-            );
+            sasCaption = this.props.isSelf ?
+                _t(
+                    "Verify the device by confirming the following emoji appers on its screen.",
+                ):
+                _t(
+                    "Verify this user by confirming the following emoji appear on their screen.",
+                );
         } else if (this.props.sas.decimal) {
             const numberBlocks = this.props.sas.decimal.map((num, i) => <span key={i}>
                 {num}
@@ -76,9 +81,13 @@ export default class VerificationShowSas extends React.Component {
             sasDisplay = <div className="mx_VerificationShowSas_decimalSas">
                 {numberBlocks}
             </div>;
-            sasCaption = _t(
-                "Verify this user by confirming the following number appears on their screen.",
-            );
+            sasCaption = this.props.isSelf ?
+                _t(
+                    "Verify this device by confirming the following number appears on its screen.",
+                ):
+                _t(
+                    "Verify this user by confirming the following number appears on their screen.",
+                );
         } else {
             return <div>
                 {_t("Unable to find a supported verification method.")}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 595ef689a7..439614d2a8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -444,7 +444,9 @@
     "You've successfully verified this user.": "You've successfully verified this user.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
     "Got It": "Got It",
+    "Verify the device by confirming the following emoji appers on its screen.": "Verify the device by confirming the following emoji appers on its screen.",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
+    "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Cancel": "Cancel",