diff --git a/lib/assets/javascripts/views/devise/registrations/edit.js b/lib/assets/javascripts/views/devise/registrations/edit.js
index d976b2e..bc56b57 100644
--- a/lib/assets/javascripts/views/devise/registrations/edit.js
+++ b/lib/assets/javascripts/views/devise/registrations/edit.js
@@ -15,7 +15,7 @@
   const sensitiveInfoCheck = (event) => {
     const originalEmail = $('#original_email').val();
     const originalOrg = $('#original_org').val();
-    const email = $('#personal_details_registration_form #user_email').val();
+    const email = $('#personal_details_registration_form [name="user[email]"]').val();
     const org = $('#personal_details_registration_form #user_org_id').val();
     const pwd = $('#password-confirmation input[name="user[current_password]"]').val();
     const orgConfirm = $('#confirm_org_change').is(':checked');
@@ -23,7 +23,6 @@
 
     $('#email-change').addClass('hide');
     $('#org-change').addClass('hide');
-
     // If the Email has changed show the Password confirmation
     if (isString(originalEmail) && isString(email)) {
       if (originalEmail.toLowerCase() !== email.toLowerCase() && !isValidPassword(pwd)) {
@@ -53,7 +52,8 @@
   // Devise seems to require both the password and current_password so sync them
   // when the user enters their password in the modal
   $('#password-confirmation input[name="user[current_password]"]').change((e) => {
-    $('#password-confirmation #user_password').val($(e.target).val());
+    $('#password-confirmation input[name="user[password]"]')
+      .val($(e.target).val());
   });
 
   // Submit the form when the user clicks the confirmation button on the modal