diff --git a/addon/components/validated-input.hbs b/addon/components/validated-input.hbs
index 89b1a77d..05934102 100644
--- a/addon/components/validated-input.hbs
+++ b/addon/components/validated-input.hbs
@@ -21,11 +21,11 @@
}}
{{#if @hint}}
-
+
{{/if}}
{{#if (and this.showValidity this.errors)}}
-
+
{{/if}}
{{else}}
{{/if}}
\ No newline at end of file
diff --git a/addon/components/validated-input.js b/addon/components/validated-input.js
index 56cf21fa..848e2b5f 100644
--- a/addon/components/validated-input.js
+++ b/addon/components/validated-input.js
@@ -1,5 +1,6 @@
import { action, set, get } from "@ember/object";
import { guidFor } from "@ember/object/internals";
+import { isEmpty } from "@ember/utils";
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
@@ -21,6 +22,14 @@ import passedOrDefault from "ember-validated-form/passed-or-default";
export default class ValidatedInputComponent extends Component {
inputId = guidFor(this);
+ get errorId() {
+ return `${this.inputId}-error`;
+ }
+
+ get hintId() {
+ return !isEmpty(this.args.hint) ? `${this.inputId}-hint` : null;
+ }
+
@tracked dirty;
@tracked required;
@tracked type;
diff --git a/addon/components/validated-input/error.hbs b/addon/components/validated-input/error.hbs
index e50487ed..587ecd02 100644
--- a/addon/components/validated-input/error.hbs
+++ b/addon/components/validated-input/error.hbs
@@ -1,9 +1,10 @@
{{#if (macroCondition (macroGetOwnConfig "isUikit"))}}
-
+
{{yield}}{{this.errorString}}
{{else}}
{{option.label}}
@@ -29,6 +30,7 @@
id="{{@inputId}}-{{i}}"
disabled={{@disabled}}
{{on "input" (fn this.onUpdate option.key)}}
+ ...attributes
/>
@labelComponent>
{{else if (macroCondition (macroGetOwnConfig "isBootstrap"))}}
@@ -24,6 +25,7 @@
disabled={{@disabled}}
checked={{@value}}
{{on "input" this.onUpdate}}
+ ...attributes
/>
<@labelComponent class="custom-control-label" />
diff --git a/addon/components/validated-input/types/radio-group.hbs b/addon/components/validated-input/types/radio-group.hbs
index e0187b49..c4bffd3b 100644
--- a/addon/components/validated-input/types/radio-group.hbs
+++ b/addon/components/validated-input/types/radio-group.hbs
@@ -15,6 +15,7 @@
id="{{@inputId}}-{{i}}"
disabled={{@disabled}}
{{on "input" (fn this.onUpdate option.key)}}
+ ...attributes
/>
{{option.label}}
@@ -31,6 +32,7 @@
id="{{@inputId}}-{{i}}"
disabled={{@disabled}}
{{on "input" (fn this.onUpdate option.key)}}
+ ...attributes
/>