diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 3852ce2..ad603e1 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -135,9 +135,6 @@ class AccountController < ApplicationController
       rescue User::IncorrectPassword => e
         session[:notice] = _('The supplied current password is incorrect.')
         render :action => 'change_password'
-      rescue ActiveRecord::RecordInvalid
-        session[:notice] = _("Passwords don't match!")
-        render :action => 'change_password'
       end
     else
       render :action => 'change_password'
diff --git a/app/views/account/change_password.rhtml b/app/views/account/change_password.rhtml
index 9993cae..5578eff 100644
--- a/app/views/account/change_password.rhtml
+++ b/app/views/account/change_password.rhtml
@@ -1,17 +1,17 @@
 <h1><%= _('Change password') %></h1>
 
-<% form_tag do %>
+<%= error_messages_for :change_password %>
 
-<p><label for="password"><%= _('Current password') %></label><br/>
-<%= password_field_tag :current_password %></p>
+<% form_for(:change_password) do |f| %>
 
-<p><label for="password"><%= _('New password') %></label><br/>
-<%= password_field_tag :new_password %></p>
+  <%= labelled_form_field(_('Current password'), (f.password_field :current_password)) %>
+  <%= labelled_form_field(_('New password'), (f.password_field :new_password)) %>
+  <%= labelled_form_field(_('Confirm your new Password'), (f.password_field :new_password_confirmation)) %>
 
-<p><label for="password_confirmation"><%= _('Confirm your new Password') %></label><br/>
-<%= password_field_tag :new_password_confirmation %></p>
-
-<%= submit_button :ok, _('Change password') %>
+  <p>
+  <% button_bar do %>
+    <%= submit_button :ok, _('Change password') %>
+  <% end %>
+  </p>
 
 <% end %>
-
--
libgit2 0.21.2