diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 4689bd7bb..37cd90f0a 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -40,13 +40,13 @@
     = f.error_messages
     %p
       = f.label :current_password, t('.current_password')
-      = f.password_field :current_password, :placeholder => "the one you sign in with..."
+      = f.password_field :current_password, :placeholder => t('.current_password_expl')
     %p
       = f.label :password, t('.new_password')
-      = f.password_field :password, :placeholder => 'must be at least six charaters'
+      = f.password_field :password, :placeholder => t('.character_minimum_expl')
     %p
       = f.label :password_confirmation, t('password_confirmation')
-      = f.password_field :password_confirmation, :placeholder => 'must be at least six charaters'
+      = f.password_field :password_confirmation, :placeholder => t('.character_minimum_expl')
 
     .submit_block
       = link_to t('cancel'), edit_user_path
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dc8661697..fc3ebca21 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -955,6 +955,8 @@ en:
       change_email: "Change email"
       new_password: "New password"
       current_password: "Current password"
+      current_password_expl: "the one you sign in with..."
+      character_minimum_expl: "must be at least six characters"
       download_xml: "download my xml"
       download_photos: "download my photos"
       your_handle: "Your Diaspora ID"