diff --git a/ui/admin/app/components/form/credential/json/index.hbs b/ui/admin/app/components/form/credential/json/index.hbs
index 3ba3c947c..ff8eedfc4 100644
--- a/ui/admin/app/components/form/credential/json/index.hbs
+++ b/ui/admin/app/components/form/credential/json/index.hbs
@@ -58,7 +58,7 @@
       @types={{@types}}
       @changeType={{@changeType}}
     />
-    <Hds::Form::Fieldset as |F|>
+    <Hds::Form::Fieldset @isRequired={{true}} as |F|>
       <F.Legend>{{t 'resources.credential.form.json.label'}}</F.Legend>
       <F.HelperText>{{t 'resources.credential.form.json.help'}}</F.HelperText>
       <F.Control>
diff --git a/ui/admin/app/components/form/credential/ssh_private_key/index.hbs b/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
index 343d5d18b..42fa4bd9d 100644
--- a/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
+++ b/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
@@ -73,6 +73,7 @@
     name='username'
     @value={{@model.username}}
     @isInvalid={{@model.errors.username}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'username')}}
     as |F|
diff --git a/ui/admin/app/components/form/credential/username_password/index.hbs b/ui/admin/app/components/form/credential/username_password/index.hbs
index 05b3c75f9..ec2f175aa 100644
--- a/ui/admin/app/components/form/credential/username_password/index.hbs
+++ b/ui/admin/app/components/form/credential/username_password/index.hbs
@@ -74,6 +74,7 @@
     name='username'
     @value={{@model.username}}
     @isInvalid={{@model.errors.username}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'username')}}
     as |F|
@@ -95,6 +96,7 @@
       @type='password'
       @value={{@model.password}}
       @isInvalid={{@model.errors.password}}
+      @isRequired={{true}}
       disabled={{form.disabled}}
       autocomplete='new-password'
       {{on 'input' (set-from-event @model 'password')}}