diff --git a/resources/views/auth/forms/login/ldap.blade.php b/resources/views/auth/forms/login/ldap.blade.php
index f7903e18c..2699fda00 100644
--- a/resources/views/auth/forms/login/ldap.blade.php
+++ b/resources/views/auth/forms/login/ldap.blade.php
@@ -1,12 +1,12 @@
 <div class="form-group">
     <label for="username">{{ trans('auth.username') }}</label>
-    @include('form.text', ['name' => 'username', 'tabindex' => 1])
+    @include('form.text', ['name' => 'username', 'autofocus' => true])
 </div>
 
 @if(session('request-email', false) === true)
     <div class="form-group">
         <label for="email">{{ trans('auth.email') }}</label>
-        @include('form.text', ['name' => 'email', 'tabindex' => 1])
+        @include('form.text', ['name' => 'email'])
         <span class="text-neg">
             {{ trans('auth.ldap_email_hint') }}
         </span>
@@ -15,5 +15,5 @@
 
 <div class="form-group">
     <label for="password">{{ trans('auth.password') }}</label>
-    @include('form.password', ['name' => 'password', 'tabindex' => 1])
+    @include('form.password', ['name' => 'password'])
 </div>
\ No newline at end of file
diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php
index bfe437a8c..52fae3750 100644
--- a/resources/views/auth/forms/login/standard.blade.php
+++ b/resources/views/auth/forms/login/standard.blade.php
@@ -1,11 +1,11 @@
 <div class="form-group">
     <label for="email">{{ trans('auth.email') }}</label>
-    @include('form.text', ['name' => 'email', 'tabindex' => 1, 'focus' => 1])
+    @include('form.text', ['name' => 'email', 'autofocus' => true])
 </div>
 
 <div class="form-group">
     <label for="password">{{ trans('auth.password') }}</label>
-    @include('form.password', ['name' => 'password', 'tabindex' => 1])
+    @include('form.password', ['name' => 'password'])
     <span class="block small mt-s">
         <a href="{{ url('/password/email') }}">{{ trans('auth.forgot_password') }}</a>
     </span>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 2f3cc1f73..fbf540d71 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -22,13 +22,12 @@
                             'name' => 'remember',
                             'checked' => false,
                             'value' => 'on',
-                            'tabindex' => 1,
                             'label' => trans('auth.remember_me'),
                         ])
                     </div>
 
                     <div class="text-right">
-                        <button class="button" tabindex="1">{{ Str::title(trans('auth.log_in')) }}</button>
+                        <button class="button">{{ Str::title(trans('auth.log_in')) }}</button>
                     </div>
                 </div>
 
diff --git a/resources/views/components/custom-checkbox.blade.php b/resources/views/components/custom-checkbox.blade.php
index 6ba2f457f..fa3da02e5 100644
--- a/resources/views/components/custom-checkbox.blade.php
+++ b/resources/views/components/custom-checkbox.blade.php
@@ -3,12 +3,10 @@ $name
 $value
 $checked
 $label
-$tabindex
 --}}
 <label custom-checkbox class="toggle-switch @if($errors->has($name)) text-neg @endif">
     <input type="checkbox" name="{{$name}}" value="{{ $value }}" @if($checked) checked="checked" @endif>
-    <span tabindex="{{ $tabindex ?? '0' }}"
-          role="checkbox"
+    <span role="checkbox"
           aria-checked="{{ $checked ? 'true' : 'false' }}"
           class="custom-checkbox text-primary">@icon('check')</span>
     <span class="label">{{$label}}</span>
diff --git a/resources/views/components/toggle-switch.blade.php b/resources/views/components/toggle-switch.blade.php
index f61c07670..4d3d3e857 100644
--- a/resources/views/components/toggle-switch.blade.php
+++ b/resources/views/components/toggle-switch.blade.php
@@ -1,8 +1,7 @@
 <label toggle-switch="{{$name}}" custom-checkbox class="toggle-switch">
     <input type="hidden" name="{{$name}}" value="{{$value?'true':'false'}}"/>
     <input type="checkbox" @if($value) checked="checked" @endif>
-    <span tabindex="{{ $tabindex ?? '0' }}"
-          role="checkbox"
+    <span role="checkbox"
           aria-checked="{{ $value ? 'true' : 'false' }}"
           class="custom-checkbox text-primary">@icon('check')</span>
     <span class="label">{{ $label }}</span>
diff --git a/resources/views/form/password.blade.php b/resources/views/form/password.blade.php
index 8f7c4ee01..a3c868a8d 100644
--- a/resources/views/form/password.blade.php
+++ b/resources/views/form/password.blade.php
@@ -1,7 +1,6 @@
 <input type="password" id="{{ $name }}" name="{{ $name }}"
        @if($errors->has($name)) class="text-neg" @endif
        @if(isset($placeholder)) placeholder="{{$placeholder}}" @endif
-       @if(isset($tabindex)) tabindex="{{$tabindex}}" @endif
        @if(old($name)) value="{{ old($name)}}" @endif>
 @if($errors->has($name))
     <div class="text-neg text-small">{{ $errors->first($name) }}</div>
diff --git a/resources/views/form/text.blade.php b/resources/views/form/text.blade.php
index 89e72ddb4..4b3631a06 100644
--- a/resources/views/form/text.blade.php
+++ b/resources/views/form/text.blade.php
@@ -1,9 +1,8 @@
 <input type="text" id="{{ $name }}" name="{{ $name }}"
-       @if(isset($focus)) autofocus @endif
        @if($errors->has($name)) class="text-neg" @endif
        @if(isset($placeholder)) placeholder="{{$placeholder}}" @endif
-       @if(isset($disabled) && $disabled) disabled="disabled" @endif
-       @if(isset($tabindex)) tabindex="{{$tabindex}}" @endif
+       @if($autofocus ?? false) autofocus @endif
+       @if($disabled ?? false) disabled="disabled" @endif
        @if(isset($model) || old($name)) value="{{ old($name) ? old($name) : $model->$name}}" @endif>
 @if($errors->has($name))
     <div class="text-neg text-small">{{ $errors->first($name) }}</div>