diff --git a/frontend_tests/node_tests/settings_org.js b/frontend_tests/node_tests/settings_org.js
index 5feb01fded..ed1c55faba 100644
--- a/frontend_tests/node_tests/settings_org.js
+++ b/frontend_tests/node_tests/settings_org.js
@@ -871,21 +871,25 @@ run_test('misc', () => {
     page_params.server_name_changes_disabled = false;
     settings_account.update_name_change_display();
     assert.equal($('#full_name').attr('disabled'), false);
+    assert.equal($('.change_name_tooltip').is(':visible'), false);
 
     page_params.realm_name_changes_disabled = true;
     page_params.server_name_changes_disabled = false;
     settings_account.update_name_change_display();
     assert.equal($('#full_name').attr('disabled'), 'disabled');
+    assert($('.change_name_tooltip').is(':visible'));
 
     page_params.realm_name_changes_disabled = true;
     page_params.server_name_changes_disabled = true;
     settings_account.update_name_change_display();
     assert.equal($('#full_name').attr('disabled'), 'disabled');
+    assert($('.change_name_tooltip').is(':visible'));
 
     page_params.realm_name_changes_disabled = false;
     page_params.server_name_changes_disabled = true;
     settings_account.update_name_change_display();
     assert.equal($('#full_name').attr('disabled'), 'disabled');
+    assert($('.change_name_tooltip').is(':visible'));
 
     page_params.realm_email_changes_disabled = false;
     settings_account.update_email_change_display();
@@ -923,6 +927,7 @@ run_test('misc', () => {
     page_params.is_admin = true;
     settings_account.update_name_change_display();
     assert.equal($('#full_name').attr('disabled'), false);
+    assert.equal($('.change_name_tooltip').is(':visible'), false);
 
     settings_account.update_email_change_display();
     assert.equal($("#change_email .button").attr('disabled'), false);
diff --git a/static/templates/settings/account_settings.hbs b/static/templates/settings/account_settings.hbs
index 5b6613bdaa..378ffb043d 100644
--- a/static/templates/settings/account_settings.hbs
+++ b/static/templates/settings/account_settings.hbs
@@ -58,7 +58,7 @@
                             </button>
                         </a>
                         <i class="fa fa-question-circle change_name_tooltip settings-info-icon" data-toggle="tooltip"
-                          {{#unless page_params.is_admin}}{{#if page_params.realm_name_changes_disabled}}{{else}}{{#unless page_params.server_name_changes_disabled}}style="display:none"{{/unless}}{{/if}}{{/unless}}
+                          {{#if (or page_params.is_admin (not (or page_params.realm_name_changes_disabled page_params.server_name_changes_disabled)))}}style="display:none"{{/if}}
                           title="{{t 'Name changes are disabled in this organization. Contact an administrator to change your name.' }}"/>
                     </div>
                     <div id="change_full_name_modal" class="modal modal-bg hide fade" tabindex="-1" role="dialog"