diff --git a/frontend_tests/node_tests/settings_org.js b/frontend_tests/node_tests/settings_org.js
index 40dbe6773b..a4363d3ebf 100644
--- a/frontend_tests/node_tests/settings_org.js
+++ b/frontend_tests/node_tests/settings_org.js
@@ -752,25 +752,25 @@ test("misc", ({override_rewire}) => {
     page_params.server_name_changes_disabled = false;
     settings_account.update_name_change_display();
     assert.ok(!$("#full_name").prop("disabled"));
-    assert.ok(!$(".name-input").hasClass("name_changes_disabled_tooltip"));
+    assert.ok(!$("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
 
     page_params.realm_name_changes_disabled = true;
     page_params.server_name_changes_disabled = false;
     settings_account.update_name_change_display();
     assert.ok($("#full_name").prop("disabled"));
-    assert.ok($(".name-input").hasClass("name_changes_disabled_tooltip"));
+    assert.ok($("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
 
     page_params.realm_name_changes_disabled = true;
     page_params.server_name_changes_disabled = true;
     settings_account.update_name_change_display();
     assert.ok($("#full_name").prop("disabled"));
-    assert.ok($(".name-input").hasClass("name_changes_disabled_tooltip"));
+    assert.ok($("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
 
     page_params.realm_name_changes_disabled = false;
     page_params.server_name_changes_disabled = true;
     settings_account.update_name_change_display();
     assert.ok($("#full_name").prop("disabled"));
-    assert.ok($(".name-input").hasClass("name_changes_disabled_tooltip"));
+    assert.ok($("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
 
     page_params.realm_email_changes_disabled = false;
     settings_account.update_email_change_display();
@@ -801,7 +801,7 @@ test("misc", ({override_rewire}) => {
     page_params.is_admin = true;
     settings_account.update_name_change_display();
     assert.ok(!$("#full_name").prop("disabled"));
-    assert.ok(!$(".name-input").hasClass("name_changes_disabled_tooltip"));
+    assert.ok(!$("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
 
     settings_account.update_email_change_display();
     assert.ok(!$("#change_email_button").prop("disabled"));
diff --git a/static/js/settings_account.js b/static/js/settings_account.js
index b522b693a8..f63c756b92 100644
--- a/static/js/settings_account.js
+++ b/static/js/settings_account.js
@@ -57,10 +57,10 @@ export function update_name_change_display() {
 
     if (!settings_data.user_can_change_name()) {
         $("#full_name").prop("disabled", true);
-        $(".name-input").addClass("name_changes_disabled_tooltip");
+        $("#full_name_input_container").addClass("name_changes_disabled_tooltip");
     } else {
         $("#full_name").prop("disabled", false);
-        $(".name-input").removeClass("name_changes_disabled_tooltip");
+        $("#full_name_input_container").removeClass("name_changes_disabled_tooltip");
     }
 }
 
diff --git a/static/js/tippyjs.js b/static/js/tippyjs.js
index f72c6e77a7..b6b72f2322 100644
--- a/static/js/tippyjs.js
+++ b/static/js/tippyjs.js
@@ -399,7 +399,7 @@ export function initialize() {
     });
 
     delegate("body", {
-        target: [".name-input.name_changes_disabled_tooltip"],
+        target: ["#full_name_input_container.name_changes_disabled_tooltip"],
         content: $t({
             defaultMessage:
                 "Name changes are disabled in this organization. Contact an administrator to change your name.",
diff --git a/static/templates/settings/profile_settings.hbs b/static/templates/settings/profile_settings.hbs
index 2a0083ab27..e27f54d86f 100644
--- a/static/templates/settings/profile_settings.hbs
+++ b/static/templates/settings/profile_settings.hbs
@@ -8,7 +8,7 @@
                         <div class="user-name-section inline-block">
                             <label for="full_name" class="title inline-block">{{t "Full name" }}</label>
                             <div class="alert-notification full-name-status"></div>
-                            <div class="name-input {{#unless user_can_change_name}}name_changes_disabled_tooltip{{/unless}}">
+                            <div id="full_name_input_container" {{#unless user_can_change_name}}class="name_changes_disabled_tooltip"{{/unless}}>
                                 <input id="full_name" name="full_name" type="text" value="{{ page_params.full_name }}" {{#unless user_can_change_name}}disabled="disabled"{{/unless}} maxlength="60" />
                             </div>
                         </div>