diff --git a/static/js/settings_account.js b/static/js/settings_account.js
index 71d5cc7b00..c056afc0fa 100644
--- a/static/js/settings_account.js
+++ b/static/js/settings_account.js
@@ -29,7 +29,7 @@ import * as user_profile from "./user_profile";
 let password_quality; // Loaded asynchronously
 
 export function update_email(new_email) {
-    const email_input = $("#email_value");
+    const email_input = $("#change_email");
 
     if (email_input) {
         email_input.text(new_email);
@@ -523,7 +523,7 @@ export function set_up() {
         e.stopPropagation();
         if (!page_params.realm_email_changes_disabled || page_params.is_admin) {
             overlays.open_modal("#change_email_modal");
-            const email = $("#email_value").text().trim();
+            const email = $("#change_email").text().trim();
             $(".email_change_container").find("input[name='email']").val(email);
         }
     });
diff --git a/static/templates/settings/account_settings.hbs b/static/templates/settings/account_settings.hbs
index 8c6c09911f..825529d4eb 100644
--- a/static/templates/settings/account_settings.hbs
+++ b/static/templates/settings/account_settings.hbs
@@ -8,7 +8,7 @@
                     <div class="alert-notification" id="account-settings-status"></div>
                     <div class="input-group">
                         <label class="inline-block title">{{t "Email" }}</label>
-                        <button id='change_email' type="button" class="button btn-link small rounded inline-block" id='email_value'
+                        <button id='change_email' type="button" class="button btn-link small rounded inline-block" 
                           {{#if (and page_params.realm_email_changes_disabled (not page_params.is_admin))}}disabled="disabled"{{/if}}>
                             {{page_params.delivery_email}}
                             <i class="fa fa-pencil"></i>