diff --git a/app/views/profiles/_edit.haml b/app/views/profiles/_edit.haml
index 6f15c4038..0717f826f 100644
--- a/app/views/profiles/_edit.haml
+++ b/app/views/profiles/_edit.haml
@@ -45,16 +45,19 @@
     = t('search')
 
   %p{:class=>"checkbox_select"}
-    = label_tag 'profile[searchable]', t('profiles.edit.allow_search')
     = check_box_tag 'profile[searchable]', true, profile.searchable
+    = label_tag 'profile[searchable]', t('profiles.edit.allow_search')
   %br
   %br
 
-  %h4= t('nsfw')
-  %p.nsfw_explanation=profile.nsfw? ? t('.you_are_nsfw') : t('.you_are_safe_for_work')
+  %h4
+    = t('nsfw')
+  = t('profiles.edit.nsfw_explanation')
   %p{:class=>"checkbox_select"}
-    = check_box_tag 'profile[nsfw]', true, profile.nsfw?
-    = label_tag 'profile[nsfw]', "nsfw?"
+    = check_box_tag 'profile[nsfw]', true, profile.nsfw
+    = label_tag 'profile[nsfw]', t('profiles.edit.nsfw_check')
+  = t('profiles.edit.nsfw_explanation2')
+  %br
   %br
   %br
 
diff --git a/app/views/profiles/_edit.mobile.haml b/app/views/profiles/_edit.mobile.haml
index 8442536e9..b4a5badbd 100644
--- a/app/views/profiles/_edit.mobile.haml
+++ b/app/views/profiles/_edit.mobile.haml
@@ -43,11 +43,14 @@
     = check_box_tag 'profile[searchable]', true, profile.searchable
   %br
 
-  %h4= t('nsfw')
-  %p.nsfw_explanation=profile.nsfw? ? t('.you_are_nsfw') : t('.you_are_safe_for_work')
+  %h4
+    = t('nsfw')
+  = t('profiles.edit.nsfw_explanation')
   %p{:class=>"checkbox_select"}
-    = check_box_tag 'profile[nsfw]', true, profile.nsfw?
-    = label_tag 'profile[nsfw]', "nsfw?"
+    = check_box_tag 'profile[nsfw]', true, profile.nsfw
+    = label_tag 'profile[nsfw]', t('profiles.edit.nsfw_check')
+  = t('profiles.edit.nsfw_explanation2')
+  %br
   %br
 
   .submit_block
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 86f50b8a2..8c2c64f5b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -873,8 +873,9 @@ en:
       update_profile: "Update Profile"
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
-      you_are_nsfw: "You have marked yourself not safe for work, your content will not show up in people who have opted out of seeing objectionable content's streams."
-      you_are_safe_for_work: "You have marked yourself as safe for work, this means you agree the content you post will agree with the community guidelines."
+      nsfw_explanation: "NSFW (‘not safe for work’) is diaspora*’s self-governing community standard for content which may not be suitable to view while at work. If you plan to share such material frequently, please check this option so that everything you share will be hidden from people’s streams unless they choose to view them."
+      nsfw_explanation2: "If you choose not to select this option, please add the #nsfw tag each time you share such material."
+      nsfw_check: "Mark everything I share as NSFW"
     update:
       updated: "Profile updated"
       failed: "Failed to update profile"