diff --git a/app/components/admin/settings/featured_settings_form_component.html.erb b/app/components/admin/settings/featured_settings_form_component.html.erb
index 5ba0c392e..e3b5c6f46 100644
--- a/app/components/admin/settings/featured_settings_form_component.html.erb
+++ b/app/components/admin/settings/featured_settings_form_component.html.erb
@@ -1,6 +1,6 @@
 <%= form_for([:admin, feature]) do |f| %>
-  <%= f.hidden_field :tab, value: tab if tab %>
-  <%= f.hidden_field :value, id: dom_id(feature), value: (feature.enabled? ? "" : "active") %>
+  <%= f.hidden_field :tab, id: dom_id(feature, :tab), value: tab if tab %>
+  <%= f.hidden_field :value, id: dom_id(feature, :value), value: (feature.enabled? ? "" : "active") %>
   <%= f.submit(t("admin.settings.index.features.#{feature.enabled? ? "disable" : "enable"}"),
                class: "button expanded #{feature.enabled? ? "hollow alert" : "success"}",
                data: { confirm: t("admin.actions.confirm") }) %>
diff --git a/app/views/admin/settings/_content_types_settings_form.html.erb b/app/views/admin/settings/_content_types_settings_form.html.erb
index 0711adbb4..4c3cb347b 100644
--- a/app/views/admin/settings/_content_types_settings_form.html.erb
+++ b/app/views/admin/settings/_content_types_settings_form.html.erb
@@ -1,5 +1,5 @@
 <%= form_tag admin_update_content_types_path, method: :put, id: "edit_#{dom_id(setting)}" do %>
-  <%= hidden_field_tag "id", setting.id %>
+  <%= hidden_field_tag "id", setting.id, id: dom_id(setting, :id) %>
 
   <div class="small-12 medium-6 large-8 column">
     <% group = setting.content_type_group %>
diff --git a/app/views/admin/settings/_settings_form.html.erb b/app/views/admin/settings/_settings_form.html.erb
index 5a57e413c..1b8bc2027 100644
--- a/app/views/admin/settings/_settings_form.html.erb
+++ b/app/views/admin/settings/_settings_form.html.erb
@@ -1,7 +1,7 @@
 <%= form_for([:admin, setting]) do |f| %>
-  <%= f.hidden_field :tab, value: tab if defined?(tab) %>
+  <%= f.hidden_field :tab, id: dom_id(setting, :tab), value: tab if defined?(tab) %>
   <div class="small-12 medium-6 large-8 column">
-    <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %>
+    <%= f.text_area :value, label: false, id: dom_id(setting, :value) %>
   </div>
   <div class="small-12 medium-6 large-4 column">
     <%= f.submit(t("admin.settings.index.update_setting"), class: "button hollow expanded") %>
diff --git a/spec/system/admin/settings_spec.rb b/spec/system/admin/settings_spec.rb
index 4c06b9251..95f7831d3 100644
--- a/spec/system/admin/settings_spec.rb
+++ b/spec/system/admin/settings_spec.rb
@@ -19,7 +19,7 @@ describe "Admin settings", :admin do
     visit admin_settings_path
 
     within("#edit_setting_#{setting.id}") do
-      fill_in "setting_#{setting.id}", with: "Super Users of level 1"
+      fill_in "value_setting_#{setting.id}", with: "Super Users of level 1"
       click_button "Update"
     end
 
@@ -179,7 +179,7 @@ describe "Admin settings", :admin do
         find("#remote-census-tab").click
 
         within("#edit_setting_#{remote_census_setting.id}") do
-          fill_in "setting_#{remote_census_setting.id}", with: "New value"
+          fill_in "value_setting_#{remote_census_setting.id}", with: "New value"
           click_button "Update"
         end
 
@@ -195,7 +195,7 @@ describe "Admin settings", :admin do
       find("#tab-configuration").click
 
       within("#edit_setting_#{configuration_setting.id}") do
-        fill_in "setting_#{configuration_setting.id}", with: "New value"
+        fill_in "value_setting_#{configuration_setting.id}", with: "New value"
         click_button "Update"
       end
 
@@ -215,7 +215,7 @@ describe "Admin settings", :admin do
         click_link "Map configuration"
 
         within("#edit_setting_#{map_setting.id}") do
-          fill_in "setting_#{map_setting.id}", with: "New value"
+          fill_in "value_setting_#{map_setting.id}", with: "New value"
           click_button "Update"
         end
 
@@ -231,7 +231,7 @@ describe "Admin settings", :admin do
       find("#proposals-tab").click
 
       within("#edit_setting_#{proposal_dashboard_setting.id}") do
-        fill_in "setting_#{proposal_dashboard_setting.id}", with: "New value"
+        fill_in "value_setting_#{proposal_dashboard_setting.id}", with: "New value"
         click_button "Update"
       end