diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 57cee918c..df9c78533 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -27,7 +27,6 @@ class ProfilesController < ApplicationController
     munge_tag_string
 
     #checkbox tags wtf
-    @profile_attrs[:nsfw] ||= false
     @profile_attrs[:searchable] ||= false
     @profile_attrs[:nsfw] ||= false
 
diff --git a/features/not_safe_for_work.feature b/features/not_safe_for_work.feature
index 8bf261236..f571b1cfe 100644
--- a/features/not_safe_for_work.feature
+++ b/features/not_safe_for_work.feature
@@ -10,7 +10,9 @@ Scenario: Setting not safe for work
   And I submit the form
   Then I should be on the edit profile page
   And I should see the "you are nsfw" message
-
+  When I mark myself as safe for work
+  And I submit the form
+  Then I should see the "you are safe for work" message
 
 Scenario: NSFWs users posts are nsfw
   Given a nsfw user with email "tommy@pr0nking.com"
@@ -18,14 +20,6 @@ Scenario: NSFWs users posts are nsfw
   And I post "I love 0bj3ction4bl3 c0nt3nt!"
   Then the post "I love 0bj3ction4bl3 c0nt3nt!" should be marked nsfw
 
-Scenario: Making yourself SFW
-  Given a nsfw user with email "tommy@pr0nking.com"
-  And I sign in as "tommy@pr0nking.com"
-  And I go to the edit profile page
-  When I mark myself as safe for work
-  And I submit the form
-  Then I should see the "you are safe for work" message
-
 #  And I log out
 #  And I log in as an office worker
 #  And I am folllowing "tommy@pr0n.xxx"