diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index 2158ccb1efc..6b8726d4e4a 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,4 +1,4 @@
-<label class="control-label">{{{field.name}}}</label>
+<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}}</label>
 <div class='controls'>
-  <label class="control-label checkbox-label">{{input checked=value type="checkbox"}} {{{field.description}}}</label>
+  <label class="control-label checkbox-label">{{input id=(concat 'user-' elementId) checked=value type="checkbox"}} {{{field.description}}}</label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 88528e71112..24e8ff3081b 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,6 +1,6 @@
-<label class="control-label">{{{field.name}}}</label>
+<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}}</label>
 <div class='controls'>
-  {{combo-box content=field.options value=value none=noneLabel}}
+  {{combo-box id=(concat 'user-' elementId) content=field.options value=value none=noneLabel}}
   {{#if field.required}}<span class='required'>*</span>{{/if}}
   <div class="instructions">{{{field.description}}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 78621b55de8..1c7d9d95b51 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label">{{{field.name}}}</label>
+<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}}</label>
 <div class='controls'>
-  {{input value=value maxlength=site.user_field_max_length}}
+  {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
   {{#if field.required}}<span class='required'>*</span>{{/if}}
   <div class="instructions">{{{field.description}}}</div>
 </div>