diff --git a/ui/admin/app/components/form/account/password/change-password/index.hbs b/ui/admin/app/components/form/account/password/change-password/index.hbs
index 1a34c7872..7f86d8dcf 100644
--- a/ui/admin/app/components/form/account/password/change-password/index.hbs
+++ b/ui/admin/app/components/form/account/password/change-password/index.hbs
@@ -8,7 +8,6 @@
 
   <Hds::Form::TextInput::Field
     @isRequired={{true}}
-    @isOptional={{false}}
     @value={{this.currentPassword}}
     @type='password'
     name='currentPassword'
@@ -22,7 +21,6 @@
 
   <Hds::Form::TextInput::Field
     @isRequired={{true}}
-    @isOptional={{false}}
     @value={{this.newPassword}}
     @type='password'
     name='newPassword'
diff --git a/ui/admin/app/components/form/account/password/set-password/index.hbs b/ui/admin/app/components/form/account/password/set-password/index.hbs
index c5161b47f..c7b06e64d 100644
--- a/ui/admin/app/components/form/account/password/set-password/index.hbs
+++ b/ui/admin/app/components/form/account/password/set-password/index.hbs
@@ -2,7 +2,6 @@
 
   <Hds::Form::TextInput::Field
     @isRequired={{true}}
-    @isOptional={{false}}
     @value={{this.password}}
     @type='password'
     name='password'
diff --git a/ui/admin/app/components/form/credential-library/vault-generic/index.hbs b/ui/admin/app/components/form/credential-library/vault-generic/index.hbs
index 0130a0554..8960365fe 100644
--- a/ui/admin/app/components/form/credential-library/vault-generic/index.hbs
+++ b/ui/admin/app/components/form/credential-library/vault-generic/index.hbs
@@ -6,7 +6,6 @@
   as |form|
 >
   <Hds::Form::TextInput::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.name}}
     @isInvalid={{@model.errors.name}}
@@ -28,7 +27,6 @@
   </Hds::Form::TextInput::Field>
 
   <Hds::Form::Textarea::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.description}}
     @isInvalid={{@model.errors.description}}
diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs
index a20c290f4..05612b34e 100644
--- a/ui/admin/app/components/form/role/index.hbs
+++ b/ui/admin/app/components/form/role/index.hbs
@@ -7,7 +7,6 @@
 >
 
   <Hds::Form::TextInput::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.name}}
     @isInvalid={{@model.errors.name}}
@@ -29,7 +28,6 @@
   </Hds::Form::TextInput::Field>
 
   <Hds::Form::Textarea::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.description}}
     @isInvalid={{@model.errors.description}}
diff --git a/ui/admin/app/components/form/scope/index.hbs b/ui/admin/app/components/form/scope/index.hbs
index 3cb25832d..da1051715 100644
--- a/ui/admin/app/components/form/scope/index.hbs
+++ b/ui/admin/app/components/form/scope/index.hbs
@@ -7,7 +7,6 @@
 >
 
   <Hds::Form::TextInput::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.name}}
     @isInvalid={{@model.errors.name}}
@@ -29,7 +28,6 @@
   </Hds::Form::TextInput::Field>
 
   <Hds::Form::Textarea::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.description}}
     @isInvalid={{@model.errors.description}}
diff --git a/ui/admin/app/components/form/target/details/index.hbs b/ui/admin/app/components/form/target/details/index.hbs
index 53a5a7881..70c04a20a 100644
--- a/ui/admin/app/components/form/target/details/index.hbs
+++ b/ui/admin/app/components/form/target/details/index.hbs
@@ -28,7 +28,6 @@
   </Hds::Form::TextInput::Field>
 
   <Hds::Form::Textarea::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.description}}
     @isInvalid={{@model.errors.description}}
@@ -82,7 +81,6 @@
 
   {{#if (feature-flag 'target-network-address')}}
     <Hds::Form::TextInput::Field
-      @isRequired={{false}}
       @isOptional={{true}}
       @value={{@model.address}}
       @isInvalid={{@model.errors.address}}
@@ -132,7 +130,6 @@
   </Hds::Form::TextInput::Field>
 
   <Hds::Form::TextInput::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.session_max_seconds}}
     @isInvalid={{@model.errors.session_max_seconds}}
@@ -154,7 +151,6 @@
   </Hds::Form::TextInput::Field>
 
   <Hds::Form::TextInput::Field
-    @isRequired={{false}}
     @isOptional={{true}}
     @value={{@model.session_connection_limit}}
     @isInvalid={{@model.errors.session_connection_limit}}
@@ -180,7 +176,6 @@
     <Hds::Form::Fieldset
       class='target-workers'
       @layout='horizontal'
-      @isRequired={{false}}
       @isOptional={{true}}
       as |F|
     >
@@ -291,7 +286,6 @@
 
   {{else}}
     <Hds::Form::TextInput::Field
-      @isRequired={{false}}
       @isOptional={{true}}
       @value={{@model.worker_filter}}
       @isInvalid={{@model.errors.worker_filter}}
diff --git a/ui/admin/app/components/form/target/worker-filter/index.hbs b/ui/admin/app/components/form/target/worker-filter/index.hbs
index f1a7f5cb1..acd4f1ea1 100644
--- a/ui/admin/app/components/form/target/worker-filter/index.hbs
+++ b/ui/admin/app/components/form/target/worker-filter/index.hbs
@@ -4,7 +4,6 @@
     name='target-worker-filter-toggle'
     checked={{@toggleEnabled}}
     disabled={{@disabled}}
-    @isRequired={{false}}
     @isOptional={{true}}
     {{on 'change' @toggleAction}}
     as |F|
@@ -17,7 +16,6 @@
 
   {{#if @toggleEnabled}}
     <Hds::Form::TextInput::Field
-      @isRequired={{false}}
       @isOptional={{true}}
       @value={{@value}}
       @isInvalid={{@isInvalid}}