diff --git a/code/frontend/src/app/ui/input/input.component.html b/code/frontend/src/app/ui/input/input.component.html
index ee80edd6..35880d89 100644
--- a/code/frontend/src/app/ui/input/input.component.html
+++ b/code/frontend/src/app/ui/input/input.component.html
@@ -2,7 +2,7 @@
   <label class="input-label">
     {{ label() }}
     @if (helpKey()) {
-      <button class="field-help-btn" (click)="onHelpClick($event)" aria-label="Open documentation" tabindex="-1">
+      <button type="button" class="field-help-btn" (click)="onHelpClick($event)" [attr.aria-label]="'Open documentation for ' + label()">
         <ng-icon name="tablerQuestionMark" size="14" />
       </button>
     }
@@ -22,7 +22,7 @@
     (blur)="blurred.emit($event)"
   />
   @if (type() === 'password') {
-    <button class="input-eye-btn" (click)="toggleSecret($event)" tabindex="-1" aria-label="Toggle visibility">
+    <button type="button" class="input-eye-btn" (click)="toggleSecret($event)" [attr.aria-label]="showSecret() ? 'Hide password' : 'Show password'">
       <ng-icon [name]="showSecret() ? 'tablerEyeOff' : 'tablerEye'" size="16" />
     </button>
   }