diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html
index a2362d978..e0be3b415 100644
--- a/client/src/app/+login/login.component.html
+++ b/client/src/app/+login/login.component.html
@@ -35,7 +35,7 @@
             <my-input-toggle-hidden formControlName="password" id="password"
                                     i18n-placeholder placeholder="Password"
                                     [ngClass]="{ 'input-error': formErrors['password'] }"
-                                    autocomplete="current-password" tabindex="2"></my-input-toggle-hidden>
+                                    autocomplete="current-password" [tabindex]="2"></my-input-toggle-hidden>
             <div *ngIf="formErrors.password" class="form-error">
               {{ formErrors.password }}
             </div>
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.html b/client/src/app/shared/shared-forms/input-toggle-hidden.component.html
index f59dc6215..af7c6650f 100644
--- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.html
+++ b/client/src/app/shared/shared-forms/input-toggle-hidden.component.html
@@ -1,5 +1,5 @@
 <div class="input-group input-group-sm">
-  <input [id]="id" [autocomplete]="autocomplete" [value]="value" [placeholder]="placeholder" [(ngModel)]="value" (ngModelChange)="update()" [ngClass]="{ 'readonly': readonly }" [readonly]="readonly"
+  <input [id]="id" [autocomplete]="autocomplete" [value]="value" [placeholder]="placeholder" [tabindex]="tabindex" [(ngModel)]="value" (ngModelChange)="update()" [ngClass]="{ 'readonly': readonly }" [readonly]="readonly"
          #input (click)="input.select()" (input)="update()" (change)="update()" [type]="inputType" class="form-control" />
 
   <div *ngIf="withToggle || withCopy" class="input-group-append">
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.ts b/client/src/app/shared/shared-forms/input-toggle-hidden.component.ts
index 0e974426b..56e5b9762 100644
--- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.ts
+++ b/client/src/app/shared/shared-forms/input-toggle-hidden.component.ts
@@ -19,6 +19,7 @@ export class InputToggleHiddenComponent implements ControlValueAccessor {
   @Input() value = ''
   @Input() autocomplete = 'off'
   @Input() placeholder = ''
+  @Input() tabindex = 0
   @Input() withToggle = true
   @Input() withCopy = false
   @Input() readonly = false