diff --git a/src/common-components/FormGroup.jsx b/src/common-components/FormGroup.jsx
index 77ba9b32..9c3acde1 100644
--- a/src/common-components/FormGroup.jsx
+++ b/src/common-components/FormGroup.jsx
@@ -26,6 +26,7 @@ const FormGroup = (props) => {
         as={props.as}
         readOnly={props.readOnly}
         type={props.type}
+        aria-invalid={props.errorMessage !== ''}
         className="form-field"
         autoComplete={props.autoComplete}
         name={props.name}
diff --git a/src/common-components/PasswordField.jsx b/src/common-components/PasswordField.jsx
index 2d19480a..8353eaea 100644
--- a/src/common-components/PasswordField.jsx
+++ b/src/common-components/PasswordField.jsx
@@ -63,6 +63,7 @@ const PasswordField = (props) => {
           type={isPasswordHidden ? 'password' : 'text'}
           name={props.name}
           value={props.value}
+          aria-invalid={props.errorMessage !== ''}
           onFocus={handleFocus}
           onBlur={handleBlur}
           onChange={props.handleChange}