diff --git a/web/app/activate/activateForm.tsx b/web/app/activate/activateForm.tsx
index 3b1eed6f09a5d..8e9691b35476d 100644
--- a/web/app/activate/activateForm.tsx
+++ b/web/app/activate/activateForm.tsx
@@ -143,6 +143,7 @@ const ActivateForm = () => {
                     onChange={e => setName(e.target.value)}
                     placeholder={t('login.namePlaceholder') || ''}
                     className={'appearance-none block w-full rounded-lg pl-[14px] px-3 py-2 border border-gray-200 hover:border-gray-300 hover:shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 placeholder-gray-400 caret-primary-600 sm:text-sm pr-10'}
+                    tabIndex={1}
                   />
                 </div>
               </div>
@@ -159,6 +160,7 @@ const ActivateForm = () => {
                     onChange={e => setPassword(e.target.value)}
                     placeholder={t('login.passwordPlaceholder') || ''}
                     className={'appearance-none block w-full rounded-lg pl-[14px] px-3 py-2 border border-gray-200 hover:border-gray-300 hover:shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 placeholder-gray-400 caret-primary-600 sm:text-sm pr-10'}
+                    tabIndex={2}
                   />
                 </div>
                 <div className='mt-1 text-xs text-gray-500'>{t('login.error.passwordInvalid')}</div>
diff --git a/web/app/signin/normalForm.tsx b/web/app/signin/normalForm.tsx
index 7f23c7d22e5ff..816df8007d9e7 100644
--- a/web/app/signin/normalForm.tsx
+++ b/web/app/signin/normalForm.tsx
@@ -217,6 +217,7 @@ const NormalForm = () => {
                       autoComplete="email"
                       placeholder={t('login.emailPlaceholder') || ''}
                       className={'appearance-none block w-full rounded-lg pl-[14px] px-3 py-2 border border-gray-200 hover:border-gray-300 hover:shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 placeholder-gray-400 caret-primary-600 sm:text-sm'}
+                      tabIndex={1}
                     />
                   </div>
                 </div>
@@ -241,6 +242,7 @@ const NormalForm = () => {
                       autoComplete="current-password"
                       placeholder={t('login.passwordPlaceholder') || ''}
                       className={'appearance-none block w-full rounded-lg pl-[14px] px-3 py-2 border border-gray-200 hover:border-gray-300 hover:shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 placeholder-gray-400 caret-primary-600 sm:text-sm pr-10'}
+                      tabIndex={2}
                     />
                     <div className="absolute inset-y-0 right-0 flex items-center pr-3">
                       <button