diff --git a/Changelog.md b/Changelog.md
index 2d6e9bfd1..63c38d20f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -35,6 +35,7 @@
 * Adjust Facebook character limit to reality [#4380](https://github.com/diaspora/diaspora/issues/4380)
 * Restore truncated URLs when posting to Twitter [#4211](https://github.com/diaspora/diaspora/issues/4211)
 * Fix mobile search tags [#4392](https://github.com/diaspora/diaspora/issues/4392)
+* Remove placeholders for name fields in settings (no more Sofaer) [#4385](https://github.com/diaspora/diaspora/pull/4385)
 
 ## Features
 * Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)
diff --git a/app/views/profiles/_edit_public.haml b/app/views/profiles/_edit_public.haml
index 39df8f72a..e0c631aa9 100644
--- a/app/views/profiles/_edit_public.haml
+++ b/app/views/profiles/_edit_public.haml
@@ -42,10 +42,10 @@
 %h4
   = t('profiles.edit.your_name')
 = label_tag 'profile[first_name]', t('profiles.edit.first_name')
-= text_field_tag 'profile[first_name]', profile.first_name, :placeholder => "Raphael"
+= text_field_tag 'profile[first_name]', profile.first_name
 
 = label_tag 'profile[first_name]', t('profiles.edit.last_name')
-= text_field_tag 'profile[last_name]', profile.last_name, :placeholder => "Sofaer"
+= text_field_tag 'profile[last_name]', profile.last_name
 
 %br
 
diff --git a/app/views/profiles/_edit_public.mobile.haml b/app/views/profiles/_edit_public.mobile.haml
index eab701ffe..186f429bf 100644
--- a/app/views/profiles/_edit_public.mobile.haml
+++ b/app/views/profiles/_edit_public.mobile.haml
@@ -49,10 +49,10 @@
 %h4
   = t('profiles.edit.your_name')
 = label_tag 'profile[first_name]', t('profiles.edit.first_name')
-= text_field_tag 'profile[first_name]', profile.first_name, :placeholder => "Raphael"
+= text_field_tag 'profile[first_name]', profile.first_name
 
 = label_tag 'profile[first_name]', t('profiles.edit.last_name')
-= text_field_tag 'profile[last_name]', profile.last_name, :placeholder => "Sofaer"
+= text_field_tag 'profile[last_name]', profile.last_name
 
 %br