diff --git a/ui/admin/app/components/form/field/secret-input/index.hbs b/ui/admin/app/components/form/field/secret-input/index.hbs
index 721ef39dd..b47965f28 100644
--- a/ui/admin/app/components/form/field/secret-input/index.hbs
+++ b/ui/admin/app/components/form/field/secret-input/index.hbs
@@ -11,7 +11,7 @@
     @isRequired={{@isRequired}}
     @isInvalid={{@isInvalid}}
     @value={{@value}}
-    @type={{@type}}
+    @type={{(or @type 'password')}}
     name={{@name}}
     disabled={{or @isDisabled (not this.isEditing)}}
     ...attributes
diff --git a/ui/admin/app/components/form/storage-bucket/index.hbs b/ui/admin/app/components/form/storage-bucket/index.hbs
index 3bd26790c..a00ede4ef 100644
--- a/ui/admin/app/components/form/storage-bucket/index.hbs
+++ b/ui/admin/app/components/form/storage-bucket/index.hbs
@@ -174,7 +174,7 @@
       @isRequired={{true}}
       @value={{@model.access_key_id}}
       @isInvalid={{@model.errors.access_key_id}}
-      @type='text'
+      @type='password'
       name='access_key_id'
       {{on 'input' (set-from-event @model 'access_key_id')}}
       as |F|
@@ -198,7 +198,7 @@
       @isRequired={{true}}
       @value={{@model.secret_access_key}}
       @isInvalid={{@model.errors.secret_access_key}}
-      @type='text'
+      @type='password'
       name='secret_access_key'
       disabled={{form.disabled}}
       {{on 'input' (set-from-event @model 'secret_access_key')}}
@@ -223,7 +223,6 @@
       @isRequired={{true}}
       @value={{@model.access_key_id}}
       @isInvalid={{@model.errors.access_key_id}}
-      @type='text'
       @name='access_key_id'
       @isDisabled={{form.disabled}}
       @showEditButton={{true}}
@@ -250,7 +249,6 @@
       @isRequired={{true}}
       @value={{@model.secret_access_key}}
       @isInvalid={{@model.errors.secret_access_key}}
-      @type='text'
       @name='secret_access_key'
       @isDisabled={{form.disabled}}
       @showEditButton={{true}}
diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss
index 73d80d45c..0d36229a9 100644
--- a/ui/admin/app/styles/app.scss
+++ b/ui/admin/app/styles/app.scss
@@ -751,7 +751,7 @@
     height: 1rem;
     position: absolute;
     bottom: 2.15rem;
-    left: 0.25rem;
+    left: 0.5rem;
     border-radius: 0.25rem;
     background-color: var(--token-color-palette-neutral-200);
   }