diff --git a/addons/rose/addon/components/rose/form/input.js b/addons/rose/addon/components/rose/form/input.js
index 5d2710b93..2fd69d8c2 100644
--- a/addons/rose/addon/components/rose/form/input.js
+++ b/addons/rose/addon/components/rose/form/input.js
@@ -6,6 +6,7 @@ import layout from '../../../templates/components/rose/form/input';
  *
  * @example
  *  <Rose::Form::Input
+ *    @id="fieldId"
  *    @type="text"
  *    @value="Text"
  *    @label="Label"
diff --git a/addons/rose/addon/components/rose/form/textarea.js b/addons/rose/addon/components/rose/form/textarea.js
index e8a8eb7a2..835764c94 100644
--- a/addons/rose/addon/components/rose/form/textarea.js
+++ b/addons/rose/addon/components/rose/form/textarea.js
@@ -7,6 +7,7 @@ import layout from '../../../templates/components/rose/form/textarea';
  *
  * @example
  *  <Rose::Form::Textarea
+ *    @id="fieldId"
  *    @value="Text"
  *    @label="Label"
  *    @helperText="Helper text"
diff --git a/addons/rose/addon/templates/components/rose/form/input.hbs b/addons/rose/addon/templates/components/rose/form/input.hbs
index dbca19a99..fe8e86eed 100644
--- a/addons/rose/addon/templates/components/rose/form/input.hbs
+++ b/addons/rose/addon/templates/components/rose/form/input.hbs
@@ -1,6 +1,6 @@
 <div class="rose-form-input{{if @error " error"}}">
 
-  <label class="rose-form-input-label">
+  <label class="rose-form-input-label" for={{@id}}>
     {{@label}}
   </label>
 
@@ -11,6 +11,7 @@
   <Input
     ...attributes
     class="rose-form-input-field"
+    id={{@id}}
     @type={{@type}}
     @value={{@value}} />
 
diff --git a/addons/rose/addon/templates/components/rose/form/textarea.hbs b/addons/rose/addon/templates/components/rose/form/textarea.hbs
index 3cb51c4ec..94017089a 100644
--- a/addons/rose/addon/templates/components/rose/form/textarea.hbs
+++ b/addons/rose/addon/templates/components/rose/form/textarea.hbs
@@ -1,6 +1,6 @@
 <div class="rose-form-input{{if @error " error"}}">
 
-  <label class="rose-form-input-label">
+  <label class="rose-form-input-label" for={{@id}}>
     {{@label}}
   </label>
 
@@ -10,6 +10,7 @@
 
   <Textarea
     ...attributes
+    id={{@id}}
     class="rose-form-input-field"
     @value={{@value}} />