diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index 6fd93fc..e42e010 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -14,7 +14,7 @@
 
     <div class="form-input">
       <label for="user_password"><%= _('New Password') %></label>
-      <input type="password" id="user_password" name="user[password]"
+      <input type="password" id="user_new_password" name="user[password]"
              class="left-indent required input-medium" value="" />
       <span role="" id="password_error"
             class="error-tooltip-right left-indent"></span>
diff --git a/lib/assets/javascripts/views/devise/registrations/edit.js b/lib/assets/javascripts/views/devise/registrations/edit.js
index ff38153..d5365b8 100644
--- a/lib/assets/javascripts/views/devise/registrations/edit.js
+++ b/lib/assets/javascripts/views/devise/registrations/edit.js
@@ -20,7 +20,7 @@
   });
   
   // Toggle the password field so that its visible/masked
-  $("#passwords_show").click(function(){
+  $("#password_show").click(function(){
     var typ = $("#user_current_password").attr('type');
     $("#user_current_password").attr('type', (typ === 'password' ? 'text' : 'password'));
     $("#user_new_password").attr('type', (typ === 'password' ? 'text' : 'password'));
@@ -28,7 +28,7 @@
   });
   
   // Make sure the show password checkbox is unchecked on load
-  $("#passwords_show").attr("checked", false);
+  $("#password_show").attr("checked", false);
   
   toggleSubmit();
   
@@ -49,8 +49,7 @@
     var disabled = ($("#user_firstname").val().trim().length <= 0 || 
                     $("#user_surname").val().trim().length <= 0 || 
                     validateEmail($("#user_email").val()) != '' ||
-                    validateEmail($("#user_recovery_email").val()) != '' ||
-                    $("#user_new_password").val() != $("#user_password_confirmation").val());
+                    validateEmail($("#user_recovery_email").val()) != '');
     $("#update").attr('aria-disabled', disabled);
   }
 });