diff --git a/app/models/change_password.rb b/app/models/change_password.rb
index 060fdf4..db5e809 100644
--- a/app/models/change_password.rb
+++ b/app/models/change_password.rb
@@ -1,15 +1,3 @@
-# TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task
-
-# FIXME remove this workaround
-class HumanName
-  def human_name
-    @name
-  end
-  def initialize(name)
-    @name = name
-  end
-end
-
 class ChangePassword < Task
 
   serialize :data, Hash
@@ -17,15 +5,22 @@ class ChangePassword < Task
     self[:data] ||= {}
   end
 
-  # FIXME ugly workaround
-  self.columns_hash['login'] = HumanName.new _('Username')
-  self.columns_hash['email'] = HumanName.new _('e-Mail')
-
   attr_accessor :login, :email, :password, :password_confirmation
-  N_('ChangePassword|Login')
-  N_('ChangePassword|Email')
-  N_('ChangePassword|Password')
-  N_('ChangePassword|Password Confirmation')
+
+  def self.human_attribute_name(attrib)
+    case attrib.to_sym
+    when :login:
+      _('Username')
+    when :email
+      _('e-Mail')
+    when :password
+      _('Password')
+    when :password_confirmation
+      _('Password Confirmation')
+    else
+      _(self.superclass.human_attribute_name(attrib))
+    end
+  end
 
   ###################################################
   # validations for creating a ChangePassword task 
diff --git a/app/views/account/change_password.rhtml b/app/views/account/change_password.rhtml
index e909f48..9993cae 100644
--- a/app/views/account/change_password.rhtml
+++ b/app/views/account/change_password.rhtml
@@ -11,7 +11,7 @@
 <p><label for="password_confirmation"><%= _('Confirm your new Password') %></label><br/>
 <%= password_field_tag :new_password_confirmation %></p>
 
-<%= submit_tag _('Change password') %>
+<%= submit_button :ok, _('Change password') %>
 
 <% end %>
 
diff --git a/app/views/account/new_password.rhtml b/app/views/account/new_password.rhtml
index 6638260..bf75be8 100644
--- a/app/views/account/new_password.rhtml
+++ b/app/views/account/new_password.rhtml
@@ -11,7 +11,7 @@
   <%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
   <%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
   <% button_bar do %>
-    <%= submit_button('change_password', _('Change password')) %>
+    <%= submit_button(:ok, _('Change password')) %>
   <% end %>
 
 <% end %>
--
libgit2 0.21.2