diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 1bd1beb6ea7..495d1194855 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -92,9 +92,9 @@ export default Ember.Controller.extend(
       return userId !== this.get("currentUser.id");
     },
 
-    @computed("model.second_factor_enabled")
-    canUpdateAssociatedAccounts(secondFactorEnabled) {
-      if (secondFactorEnabled) {
+    @computed("model.second_factor_enabled", "CanCheckEmails")
+    canUpdateAssociatedAccounts(secondFactorEnabled, canCheckEmails) {
+      if (secondFactorEnabled || !canCheckEmails) {
         return false;
       }
 
@@ -106,8 +106,13 @@ export default Ember.Controller.extend(
 
     @computed("showAllAuthTokens", "model.user_auth_tokens")
     authTokens(showAllAuthTokens, tokens) {
-      tokens.sort((a, b) =>
-        a.is_active ? -1 : b.is_active ? 1 : b.seen_at.localeCompare(a.seen_at)
+      tokens.sort(
+        (a, b) =>
+          a.is_active
+            ? -1
+            : b.is_active
+              ? 1
+              : b.seen_at.localeCompare(a.seen_at)
       );
 
       return showAllAuthTokens
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js.es6
index ed5044edf11..59216a7ccc9 100644
--- a/test/javascripts/controllers/preferences-account-test.js.es6
+++ b/test/javascripts/controllers/preferences-account-test.js.es6
@@ -17,5 +17,9 @@ QUnit.test("updating of associated accounts", function(assert) {
 
   controller.set("model.second_factor_enabled", false);
 
+  assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
+
+  controller.set("CanCheckEmails", true);
+
   assert.equal(controller.get("canUpdateAssociatedAccounts"), true);
 });