diff --git a/web/src/user_profile.ts b/web/src/user_profile.ts
index f7ff13a1ae..7e656c098a 100644
--- a/web/src/user_profile.ts
+++ b/web/src/user_profile.ts
@@ -1449,17 +1449,13 @@ export function initialize(): void {
         e.preventDefault();
     });
 
-    $("body").on(
-        "click",
-        "#user-profile-modal #name .user-profile-manage-others-edit-button",
-        (e) => {
-            show_manage_user_tab("manage-profile-tab");
-            e.stopPropagation();
-            e.preventDefault();
-        },
-    );
+    $("body").on("click", "#user-profile-modal #name .user-profile-update-user-tab-button", (e) => {
+        show_manage_user_tab("manage-profile-tab");
+        e.stopPropagation();
+        e.preventDefault();
+    });
 
-    $("body").on("click", "#user-profile-modal #name .user-profile-manage-own-edit-button", () => {
+    $("body").on("click", "#user-profile-modal #name .user-profile-profile-settings-button", () => {
         browser_history.go_to_location("#settings/profile");
         hide_user_profile();
     });
diff --git a/web/templates/user_profile_modal.hbs b/web/templates/user_profile_modal.hbs
index 5140f4ddce..9eb8dac213 100644
--- a/web/templates/user_profile_modal.hbs
+++ b/web/templates/user_profile_modal.hbs
@@ -22,15 +22,15 @@
                         {{> components/icon_button custom_classes="copy-link-to-user-profile tippy-zulip-delayed-tooltip" icon="link-alt" intent="neutral" data-tippy-content=(t "Copy link to profile") aria-label=(t "Copy link to profile") }}
                         {{#if is_me}}
                             {{#if can_manage_profile}}
-                                {{> components/icon_button custom_classes="user-profile-manage-others-edit-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Edit profile") aria-label=(t "Edit profile") }}
+                                {{> components/icon_button custom_classes="user-profile-update-user-tab-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Edit profile") aria-label=(t "Edit profile") }}
                             {{else}}
-                                {{> components/icon_button custom_classes="user-profile-manage-own-edit-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Edit profile") aria-label=(t "Edit profile") }}
+                                {{> components/icon_button custom_classes="user-profile-profile-settings-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Edit profile") aria-label=(t "Edit profile") }}
                             {{/if}}
                         {{else if can_manage_profile}}
                             {{#if is_bot}}
-                                {{> components/icon_button custom_classes="user-profile-manage-others-edit-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Manage bot") aria-label=(t "Manage bot") }}
+                                {{> components/icon_button custom_classes="user-profile-update-user-tab-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Manage bot") aria-label=(t "Manage bot") }}
                             {{else}}
-                                {{> components/icon_button custom_classes="user-profile-manage-others-edit-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Manage user") aria-label=(t 'Manage user') }}
+                                {{> components/icon_button custom_classes="user-profile-update-user-tab-button tippy-zulip-delayed-tooltip" icon="edit" intent="neutral" data-tippy-content=(t "Manage user") aria-label=(t 'Manage user') }}
                             {{/if}}
                         {{/if}}
                     </span>