diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
index 8dc72c57022..042a96a4f3f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
@@ -27,7 +27,7 @@
   </section>
 
   <section class="field search-priority">
-    <label for="category-search-priority">
+    <label>
       {{i18n "category.search_priority.label"}}
     </label>
     <div class="controls">
@@ -90,9 +90,7 @@
   <h3>{{i18n "category.settings_sections.moderation"}}</h3>
   {{#if siteSettings.enable_category_group_moderation}}
     <section class="field reviewable-by-group">
-      <label for="reviewable-by-group">
-        {{i18n "category.reviewable_by_group"}}
-      </label>
+      <label>{{i18n "category.reviewable_by_group"}}</label>
       {{group-selector
         groupFinder=groupFinder
         single="true"
@@ -171,7 +169,7 @@
   <h3>{{i18n "category.settings_sections.appearance"}}</h3>
 
   <section class="field default-view-field">
-    <label for="category-default-view">
+    <label>
       {{i18n "category.default_view"}}
     </label>
     <div class="controls">
@@ -188,7 +186,7 @@
   </section>
 
   <section class="field default-top-period-field">
-    <label for="category-default-period">
+    <label>
       {{i18n "category.default_top_period"}}
     </label>
     <div class="controls">
@@ -205,7 +203,7 @@
   </section>
 
   <section class="field sort-order">
-    <label for="category-sort-order">
+    <label>
       {{i18n "category.sort_order"}}
     </label>
     <div class="controls">
@@ -234,7 +232,7 @@
   </section>
 
   <section class="field default-filter">
-    <label for="category-default-filter">
+    <label>
       {{i18n "category.default_list_filter"}}
     </label>
     <div class="controls">
@@ -258,7 +256,7 @@
 
   {{#if showSubcategoryListStyle}}
     <section class="field subcategory-list-style-field">
-      <label for="subcategory-list-style">
+      <label>
         {{i18n "category.subcategory_list_style"}}
       </label>
       {{combo-box
@@ -274,9 +272,7 @@
   {{/if}}
 
   <section class="field category-read-only-banner">
-    <label for="category-read-only-banner">
-      {{i18n "category.read_only_banner"}}
-    </label>
+    <label for="read-only-message">{{i18n "category.read_only_banner"}}</label>
     {{text-field
         valueProperty="value"
         id="read-only-message"
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
index b8dc211c2c2..13d1031a4bd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
@@ -1,5 +1,5 @@
 <section class="field allowed-tags">
-  <label for="category-allowed-tags">{{i18n "category.tags_allowed_tags"}}</label>
+  <label>{{i18n "category.tags_allowed_tags"}}</label>
   {{tag-chooser
     id="category-allowed-tags"
     tags=category.allowed_tags
@@ -14,7 +14,7 @@
 </section>
 
 <section class="field allowed-tag-groups">
-  <label for="category-allowed-tag-groups">{{i18n "category.tags_allowed_tag_groups"}}</label>
+  <label>{{i18n "category.tags_allowed_tag_groups"}}</label>
   {{tag-group-chooser
     id="category-allowed-tag-groups"
     tagGroups=category.allowed_tag_groups
@@ -39,7 +39,7 @@
 
 <section class="field with-items">
   <section class="field-item min-tags-from-required-group">
-    <label>{{i18n "category.min_tags_from_required_group_label"}}</label>
+    <label for="category-min-tags-from-group">{{i18n "category.min_tags_from_required_group_label"}}</label>
     {{text-field value=category.min_tags_from_required_group id="category-min-tags-from-group" type="number" min="1"}}
   </section>
   <section class="field-item required-tag-group">
diff --git a/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
index 10b6ef94351..adab5e9a548 100644
--- a/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
@@ -1,5 +1,13 @@
 <div class="relative-time-picker">
-  {{input class="relative-time-duration" min=durationMin step=durationStep type="number" value=duration onChange=(action "onChangeDuration")}}
+  {{input
+    class="relative-time-duration"
+    min=durationMin
+    step=durationStep
+    type="number"
+    value=duration
+    onChange=(action "onChangeDuration")
+    id=id
+  }}
   {{combo-box
     content=intervals
     value=selectedInterval