diff --git a/ui/admin/app/components/form/credential-store/vault/index.hbs b/ui/admin/app/components/form/credential-store/vault/index.hbs
index a436ce8a5..94296ddc9 100644
--- a/ui/admin/app/components/form/credential-store/vault/index.hbs
+++ b/ui/admin/app/components/form/credential-store/vault/index.hbs
@@ -116,6 +116,7 @@
     <Hds::Form::TextInput::Field
       name='worker_filter'
       @value={{@model.worker_filter}}
+      @isOptional={{true}}
       @isInvalid={{@model.errors.worker_filter}}
       disabled={{form.disabled}}
       {{on 'input' (set-from-event @model 'worker_filter')}}
@@ -178,6 +179,7 @@
   <Hds::Form::TextInput::Field
     name='namespace'
     @value={{@model.namespace}}
+    @isOptional={{true}}
     @isInvalid={{@model.errors.namespace}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'namespace')}}
@@ -199,6 +201,7 @@
   <Hds::Form::TextInput::Field
     name='tls_server_name'
     @value={{@model.tls_server_name}}
+    @isOptional={{true}}
     @isInvalid={{@model.errors.tls_server_name}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'tls_server_name')}}
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 3a72e5b23..cd6a6e07b 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -107,6 +107,7 @@
   <Hds::Form::TextInput::Field
     name='region'
     @value={{@model.region}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'region')}}
     as |F|
@@ -123,6 +124,7 @@
   <Hds::Form::TextInput::Field
     name='access_key_id'
     @value={{@model.access_key_id}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'access_key_id')}}
     as |F|
@@ -139,6 +141,7 @@
   <Hds::Form::TextInput::Field
     name='secret_access_key'
     @value={{@model.secret_access_key}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'secret_access_key')}}
     as |F|
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index 93102306e..955bd1b4e 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -107,6 +107,7 @@
   <Hds::Form::TextInput::Field
     name='tenant_id'
     @value={{@model.tenant_id}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'tenant_id')}}
     as |F|
@@ -123,6 +124,7 @@
   <Hds::Form::TextInput::Field
     name='subscription_id'
     @value={{@model.subscription_id}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'subscription_id')}}
     as |F|
@@ -139,6 +141,7 @@
   <Hds::Form::TextInput::Field
     name='client_id'
     @value={{@model.client_id}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'client_id')}}
     as |F|
@@ -155,6 +158,7 @@
   <Hds::Form::TextInput::Field
     name='secret_value'
     @value={{@model.secret_value}}
+    @isRequired={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'secret_value')}}
     as |F|
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
index a620e73d6..0cbcb409b 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
@@ -51,9 +51,10 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
     const { id: credential_store_id } = this.modelFor(
       'scopes.scope.credential-stores.credential-store',
     );
-    const { name, description } = this.currentModel ?? {};
 
+    let name, description;
     if (this.currentModel?.isNew) {
+      ({ name, description } = this.currentModel);
       this.currentModel.rollbackAttributes();
     }