diff --git a/app/views/devise/registrations/_password_confirmation.html.erb b/app/views/devise/registrations/_password_confirmation.html.erb
index c7d7577..fb83407 100644
--- a/app/views/devise/registrations/_password_confirmation.html.erb
+++ b/app/views/devise/registrations/_password_confirmation.html.erb
@@ -33,8 +33,8 @@
       <div class="modal-footer">
         <button type="button" class="btn btn-default" id="pwd-cancel-confirmation" 
                 data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-primary" id="pwd-confirmation"
-                data-dismiss="modal">Continue</button>
+        <button type="button" class="btn btn-primary disabled" id="pwd-confirmation"
+                >Continue</button>
       </div>
     </div>
   </div>
diff --git a/lib/assets/javascripts/views/devise/registrations/edit.js b/lib/assets/javascripts/views/devise/registrations/edit.js
index d16bb29..88e4bf7 100644
--- a/lib/assets/javascripts/views/devise/registrations/edit.js
+++ b/lib/assets/javascripts/views/devise/registrations/edit.js
@@ -42,6 +42,16 @@
     }
   };
 
+  $('#confirm_org_change').click((e) => {
+    var $confirmButton = $('#pwd-confirmation');
+    if ($confirmButton.attr('data-dismiss')) {
+        $confirmButton.removeAttr('data-dismiss');
+    } else {
+        $confirmButton.attr('data-dismiss', 'modal');
+    }
+    $confirmButton.toggleClass('disabled');
+  })
+
   // If the user has changed their email address display the password
   // confirmation modal on form submission
   $('#personal_details_registration_form').submit((e) => {