diff --git a/app/components/settings/text_setting_component.html.erb b/app/components/settings/text_setting_component.html.erb
index e8bfd0d0cad..9774f600168 100644
--- a/app/components/settings/text_setting_component.html.erb
+++ b/app/components/settings/text_setting_component.html.erb
@@ -30,12 +30,13 @@ See COPYRIGHT and LICENSE files for more details.
 <%# The javscript for this component is included in `settings.js.erb`. %>
 
 <div class="form--field">
-  <%# Empty label for styling only %>
-  <%= styled_label_tag "lang", "" %>
+  <%= styled_label_tag "lang-for-#{name}" do %>
+    <%= content_tag(:span, t("setting_#{name}"), class: "sr-only") %>
+  <% end %>
   <div class="form--field-container">
     <%=
       styled_select_tag(
-        "lang",
+        "#{name}_lang",
         options_for_select(helpers.lang_options_for_select(false), current_language.to_s),
         id: "lang-for-#{name}",
         class: "lang-select-switch",
@@ -56,7 +57,7 @@ See COPYRIGHT and LICENSE files for more details.
 <% end %>
 
 <div class="form--field -visible-overflow">
-  <%= styled_label_tag "settings[#{name}]", t("setting_#{name}") %>
+  <%= styled_label_tag "settings-#{name}", t("setting_#{name}") %>
   <div class="form--field-container">
     <%=
       styled_text_area_tag(
diff --git a/spec/components/settings/text_setting_component_spec.rb b/spec/components/settings/text_setting_component_spec.rb
new file mode 100644
index 00000000000..0b7549d6409
--- /dev/null
+++ b/spec/components/settings/text_setting_component_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "rails_helper"
+
+RSpec.describe Settings::TextSettingComponent, type: :component do
+  def render_component(...)
+    render_inline(described_class.new(...))
+  end
+
+  subject(:rendered_component) { render_component("fr", name: "emails_footer") }
+
+  before do
+    with_config(emails_footer: { "en" => "blah", "fr" => "bah" })
+  end
+
+  it "renders the language select" do
+    expect(rendered_component).to have_select "lang-for-emails_footer",
+                                              with_options: [
+                                                "English",
+                                                "Español",
+                                                "Français",
+                                                "Deutsch",
+                                                "Українська",
+                                                "简体中文"
+                                              ],
+                                              selected: "Français"
+  end
+
+  it "renders the hidden textarea" do
+    expect(rendered_component).to have_field "Emails footer", type: "textarea", with: "bah"
+  end
+
+  it "renders the rich text area" do
+    expect(rendered_component).to have_element "opce-ckeditor-augmented-textarea",
+                                               "data-text-area-id": "settings-emails_footer".to_json
+  end
+end