diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 77e22a6a8..161f904c6 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -54,9 +54,11 @@
<%= f.check_box :newsletter %>
-
- <%= f.check_box :email_digest %>
-
+ <% if feature?(:proposals) %>
+
+ <%= f.check_box :email_digest %>
+
+ <% end %>
<%= f.check_box :email_on_direct_message %>
diff --git a/spec/system/account_spec.rb b/spec/system/account_spec.rb
index ed1ab76b9..91319627d 100644
--- a/spec/system/account_spec.rb
+++ b/spec/system/account_spec.rb
@@ -103,6 +103,17 @@ describe "Account" do
expect(find("#account_email_on_comment_reply")).to be_checked
end
+ scenario "Email digest checkbox only appears if proposals are enabled" do
+ visit account_path
+
+ expect(page).to have_field "Receive a summary of proposal notifications", checked: true
+
+ Setting["process.proposals"] = false
+ visit account_path
+
+ expect(page).not_to have_field "Receive a summary of proposal notifications"
+ end
+
context "Option to display badge for official position" do
scenario "Users with official position of level 1" do
official_user = create(:user, official_level: 1)