diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index dc802c4d047..8e15c955c26 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -1,9 +1,9 @@
 import { propertyEqual, setting } from 'discourse/lib/computed';
 
 export default Ember.Mixin.create({
-  isOwnEmail: propertyEqual("model.id", "currentUser.id"),
+  isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("show_email_on_profile"),
   canStaffCheckEmails: Em.computed.and("showEmailOnProfile", "currentUser.staff"),
   canAdminCheckEmails: Em.computed.alias("currentUser.admin"),
-  canCheckEmails: Em.computed.or("isOwnEmail", "canStaffCheckEmails", "canAdminCheckEmails"),
+  canCheckEmails: Em.computed.or("isCurrentUser", "canStaffCheckEmails", "canAdminCheckEmails"),
 });
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index a9a367d3da1..60c3e58b422 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -66,6 +66,7 @@
     {{passwordProgress}}
   </div>
 </div>
+
 <div class="control-group pref-second-factor">
   <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
 
@@ -84,9 +85,11 @@
       {{/if}}
     </b>
 
-    {{#link-to "preferences.second-factor" class="btn btn-small btn-icon pad-left no-text"}}
-      {{d-icon "pencil"}}
-    {{/link-to}}
+    {{#if isCurrentUser}}
+      {{#link-to "preferences.second-factor" class="btn btn-small btn-icon pad-left no-text"}}
+        {{d-icon "pencil"}}
+      {{/link-to}}
+    {{/if}}
   </div>
 </div>
 {{/if}}