From 30c26f39ea3e9e5019436aa8c8fb07110c7709bf Mon Sep 17 00:00:00 2001
From: Aleksander <170264518+t-aleksander@users.noreply.github.com>
Date: Fri, 23 Oct 2026 13:01:53 +0200
Subject: [PATCH 1/2] autofocus

---
 .../ConfigureVerifyFido2Step/ConfigureVerifyFido2Step.tsx       | 1 +
 .../wizard/ConfigureFido2Step/ConfigureFido2Step.tsx            | 1 +
 .../views/ConnectModalMfaFido2/ConnectModalMfaFido2.tsx         | 1 +
 new-ui/src/shared/components/Input/Input.tsx                    | 2 ++
 new-ui/src/shared/components/Input/types.ts                     | 1 +
 .../views/LocationCardMfaFido2View/LocationCardMfaFido2View.tsx | 1 +
 6 files changed, 7 insertions(+)

diff --git a/new-ui/src/pages/full/ConfigureMfaPage/verify/ConfigureVerifyFido2Step/ConfigureVerifyFido2Step.tsx b/new-ui/src/pages/full/ConfigureMfaPage/verify/ConfigureVerifyFido2Step/ConfigureVerifyFido2Step.tsx
index 7f2187eb2..d7f213e33 100644
--- a/new-ui/src/pages/full/ConfigureMfaPage/verify/ConfigureVerifyFido2Step/ConfigureVerifyFido2Step.tsx
+++ b/new-ui/src/pages/full/ConfigureMfaPage/verify/ConfigureVerifyFido2Step/ConfigureVerifyFido2Step.tsx
@@ -72,6 +72,7 @@ export const ConfigureVerifyFido2Step = ({ onCancel, onSessionExpired }: Props)
               <Input
                 type="password"
                 label="PIN"
+                autoFocus
                 value={pin}
                 onChange={(value) => {
                   setPin(isPresent(value) ? String(value) : null);
diff --git a/new-ui/src/pages/full/ConfigureMfaPage/wizard/ConfigureFido2Step/ConfigureFido2Step.tsx b/new-ui/src/pages/full/ConfigureMfaPage/wizard/ConfigureFido2Step/ConfigureFido2Step.tsx
index 7b0960b91..e72d8060e 100644
--- a/new-ui/src/pages/full/ConfigureMfaPage/wizard/ConfigureFido2Step/ConfigureFido2Step.tsx
+++ b/new-ui/src/pages/full/ConfigureMfaPage/wizard/ConfigureFido2Step/ConfigureFido2Step.tsx
@@ -115,6 +115,7 @@ export const ConfigureFido2Step = ({ onCancel, onSessionExpired }: Props) => {
         <Fragment>
           <Input
             label="Security key name"
+            autoFocus
             value={name}
             onChange={(value) => setName(isPresent(value) ? String(value) : null)}
             error={collectsPin ? undefined : error}
diff --git a/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaFido2/ConnectModalMfaFido2.tsx b/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaFido2/ConnectModalMfaFido2.tsx
index e27138570..a680b123a 100644
--- a/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaFido2/ConnectModalMfaFido2.tsx
+++ b/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaFido2/ConnectModalMfaFido2.tsx
@@ -79,6 +79,7 @@ export const ConnectModalMfaFido2 = () => {
             <Input
               type="password"
               label="PIN"
+              autoFocus
               value={pin}
               onChange={(value) => setPin(isPresent(value) ? String(value) : null)}
               error={error}
diff --git a/new-ui/src/shared/components/Input/Input.tsx b/new-ui/src/shared/components/Input/Input.tsx
index fdb6e6271..d77d6f4ef 100644
--- a/new-ui/src/shared/components/Input/Input.tsx
+++ b/new-ui/src/shared/components/Input/Input.tsx
@@ -42,6 +42,7 @@ export const Input = ({
   onBlur,
   onFocus,
   notNull,
+  autoFocus,
   size = 'default',
   type = 'text',
   required = false,
@@ -128,6 +129,7 @@ export const Input = ({
             aria-labelledby={id}
             ref={mergeRefs([ref, innerRef])}
             autoComplete={autocomplete}
+            autoFocus={autoFocus}
             data-testid={testId}
             value={externalValueToInput(value)}
             name={name}
diff --git a/new-ui/src/shared/components/Input/types.ts b/new-ui/src/shared/components/Input/types.ts
index 8bcdd92fc..30441a677 100644
--- a/new-ui/src/shared/components/Input/types.ts
+++ b/new-ui/src/shared/components/Input/types.ts
@@ -22,6 +22,7 @@ export type InputProps = {
   autocomplete?: HTMLInputAutoCompleteAttribute;
   testId?: string;
   notNull?: boolean;
+  autoFocus?: boolean;
 } & Pick<HTMLAttributes<HTMLInputElement>, 'onBlur' | 'onFocus'>;
 
 export type FormInputProps = Pick<
diff --git a/new-ui/src/shared/components/LocationCard/views/LocationCardMfaFido2View/LocationCardMfaFido2View.tsx b/new-ui/src/shared/components/LocationCard/views/LocationCardMfaFido2View/LocationCardMfaFido2View.tsx
index 90484182a..2865bd3f1 100644
--- a/new-ui/src/shared/components/LocationCard/views/LocationCardMfaFido2View/LocationCardMfaFido2View.tsx
+++ b/new-ui/src/shared/components/LocationCard/views/LocationCardMfaFido2View/LocationCardMfaFido2View.tsx
@@ -96,6 +96,7 @@ export const LocationCardMfaFido2View = () => {
             <Input
               type="password"
               label="PIN"
+              autoFocus
               value={pin}
               onChange={(value) => setPin(isPresent(value) ? String(value) : null)}
               error={error}

From 208d6e8e79700bb053e56b1d18fde11d3b8eb449 Mon Sep 17 00:00:00 2001
From: Aleksander <170264518+t-aleksander@users.noreply.github.com>
Date: Fri, 23 Oct 2026 13:51:14 +0200
Subject: [PATCH 2/2] Update Cargo.lock

---
 src-tauri/Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 97aa2d305..e37e0c301 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1375,9 +1375,9 @@ checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d"
 
 [[package]]
 name = "ctutils"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03bb0e1cc970d482d121d9a1744999169b69a07470b3d644a7894e53fcaf4574"
+checksum = "38d28fb6aa7dd680b3ffd1a3e64e115c177bdba63c0ae7f9cd48129ff05c4fa0"
 dependencies = [
  "cmov",
 ]