diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 134ce0d..d6b0b75 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -77,7 +77,7 @@
       @other_organisations = Org.where(parent_id: nil, is_other: true).pluck(:id)
       @identifier_schemes = IdentifierScheme.where(active: true).order(:name)
       @languages = Language.sorted_by_abbreviation
-      if params[:skip_personal_details] == true
+      if params[:skip_personal_details] == "true"
         do_update_password(current_user, params)
       else
         do_update(require_password=needs_password?(current_user, params))
@@ -163,11 +163,27 @@
       message = _('Please enter your current password')
     elsif params[:user][:password_confirmation].blank?
       message = _('Please enter a password confirmation')
-    elsif params[:user][:new_password] != params[:user][:password_confirmation]
+    elsif params[:user][:password] != params[:user][:password_confirmation]
       message = _('Password and comfirmation must match')
     else
       successfully_updated = current_user.update_with_password(password_update)
     end
+    #render the correct page
+    if successfully_updated
+      if confirm
+        current_user.skip_confirmation! # will error out if confirmable is turned off in user model
+        current_user.save!
+      end
+      session[:locale] = current_user.get_locale unless current_user.get_locale.nil?
+      set_gettext_locale  #Method defined at controllers/application_controller.rb
+      set_flash_message :notice, _('Details successfully updated.')
+      sign_in current_user, bypass: true  # Sign in the user bypassing validation in case his password changed
+      redirect_to edit_user_registration_path, notice: _('Details successfully updated.')
+
+    else
+      flash[:notice] = message.blank? ? failed_update_error(current_user, _('profile')) : message
+      render "edit"
+    end
   end
 
   def sign_up_params
diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index d953505..02e38c4 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -13,10 +13,10 @@
     </div>
 
     <div class="form-input">
-      <label for="user_new_password"><%= _('New Password') %></label>
-      <input type="password" id="user_new_password" name="user[new_password]"
+      <label for="user_password"><%= _('New Password') %></label>
+      <input type="password" id="user_password" name="user[password]"
              class="left-indent required medium-input" value="" />
-      <span role="" id="new_password_error"
+      <span role="" id="password_error"
             class="error-tooltip-right left-indent"></span>
     </div>
 
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index 4b2870d..a4ba9b4 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -73,7 +73,7 @@
                               show_export_plan_path(plan) %></li>
 
                   <li><%= link_to _('Make a copy'), 
-                              duplicate_plan_path(plan, format: :js), method: :post %></li>
+                              duplicate_plan_path(plan), method: :post, remote: true %></li>
 
                   <% if plan.owned_by?(current_user.id) then %>
                     <li><%= link_to _('Delete'),