diff --git a/spec/system/users_spec.rb b/spec/system/users_spec.rb
index 6e35977b9..34e3c19c4 100644
--- a/spec/system/users_spec.rb
+++ b/spec/system/users_spec.rb
@@ -159,10 +159,12 @@ describe "Users" do
       uncheck "account_public_activity"
       click_button "Save changes"
 
-      logout
+      expect(page).to have_content "Changes saved"
 
+      logout
       visit user_path(user)
-      expect(page).to have_content("activity list private")
+
+      expect(page).to have_content "activity list private"
     end
 
     scenario "is always visible for the owner" do
@@ -183,11 +185,13 @@ describe "Users" do
       uncheck "account_public_activity"
       click_button "Save changes"
 
-      logout
+      expect(page).to have_content "Changes saved"
 
+      logout
       login_as(create(:administrator).user)
       visit user_path(user)
-      expect(page).not_to have_content("activity list private")
+
+      expect(page).not_to have_content "activity list private"
     end
 
     scenario "is always visible for moderators" do
@@ -197,11 +201,13 @@ describe "Users" do
       uncheck "account_public_activity"
       click_button "Save changes"
 
-      logout
+      expect(page).to have_content "Changes saved"
 
+      logout
       login_as(create(:moderator).user)
       visit user_path(user)
-      expect(page).not_to have_content("activity list private")
+
+      expect(page).not_to have_content "activity list private"
     end
 
     describe "User email" do
@@ -461,8 +467,9 @@ describe "Users" do
       check "account_public_interests"
       click_button "Save changes"
 
-      logout
+      expect(page).to have_content "Changes saved"
 
+      logout
       visit user_path(user, filter: "follows")
 
       expect(page).to have_css "#public_interests"
@@ -479,10 +486,12 @@ describe "Users" do
       check "account_public_interests"
       click_button "Save changes"
 
-      logout
+      expect(page).to have_content "Changes saved"
 
+      logout
       visit user_path(user)
-      expect(page).not_to have_content("Sport")
+
+      expect(page).not_to have_content "Sport"
     end
   end
 end