diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsx
index d529e6f8c..f7d33e8a0 100644
--- a/src/app/login/LoginForm.tsx
+++ b/src/app/login/LoginForm.tsx
@@ -42,7 +42,12 @@ export function LoginForm() {
         <Logo />
       </Icon>
       <Heading>umami</Heading>
-      <Form onSubmit={handleSubmit} error={getErrorMessage(error)} style={{ minWidth: 300 }}>
+      <Form
+        onSubmit={handleSubmit}
+        error={getErrorMessage(error)}
+        defaultValues={{ username: '', password: '' }}
+        style={{ minWidth: 300 }}
+      >
         <FormField
           label={t(labels.username)}
           data-test="input-username"
diff --git a/src/app/login/two-factor/LoginTwoFactorPage.tsx b/src/app/login/two-factor/LoginTwoFactorPage.tsx
index 0aab6b183..6e3a6f6fa 100644
--- a/src/app/login/two-factor/LoginTwoFactorPage.tsx
+++ b/src/app/login/two-factor/LoginTwoFactorPage.tsx
@@ -101,7 +101,12 @@ export function LoginTwoFactorPage() {
           <Text style={{ color: 'var(--zen-status-error)' }}>{lockMessage}</Text>
         )}
 
-        <Form onSubmit={handleSubmit} error={error ?? undefined} style={{ minWidth: 300 }}>
+        <Form
+          onSubmit={handleSubmit}
+          error={error ?? undefined}
+          defaultValues={{ backupCode: '' }}
+          style={{ minWidth: 300 }}
+        >
           {!useBackup ? (
             <Column gap="2">
               <Text weight="bold">{t(labels.twoFactorEnterCode)}</Text>
diff --git a/src/components/common/OtpInput.test.tsx b/src/components/common/OtpInput.test.tsx
new file mode 100644
index 000000000..56c9ba9ff
--- /dev/null
+++ b/src/components/common/OtpInput.test.tsx
@@ -0,0 +1,42 @@
+import { fireEvent } from '@testing-library/react';
+import { expect, test, vi } from 'vitest';
+import { render, screen } from '@/test/render';
+import { OtpInput } from './OtpInput';
+
+function getDigitInput(index: number) {
+  return screen.getByLabelText(`Digit ${index + 1}`) as HTMLInputElement;
+}
+
+test('typing individual digits fills fields in order and advances focus', async () => {
+  const onChange = vi.fn();
+  const { user } = render(<OtpInput value="" onChange={onChange} />);
+
+  await user.click(getDigitInput(0));
+  await user.keyboard('1');
+
+  expect(onChange).toHaveBeenLastCalledWith('1');
+});
+
+test('a real paste event distributes the code across all fields and calls onComplete', async () => {
+  const onChange = vi.fn();
+  const onComplete = vi.fn();
+  const { user } = render(<OtpInput value="" onChange={onChange} onComplete={onComplete} />);
+
+  await user.click(getDigitInput(0));
+  await user.paste('123456');
+
+  expect(onChange).toHaveBeenLastCalledWith('123456');
+  expect(onComplete).toHaveBeenCalledWith('123456');
+});
+
+test('a multi-character value delivered via onChange (mobile paste fallback) fills all fields', () => {
+  const onChange = vi.fn();
+  const onComplete = vi.fn();
+  render(<OtpInput value="" onChange={onChange} onComplete={onComplete} />);
+
+  const input = getDigitInput(0);
+  fireEvent.change(input, { target: { value: '123456' } });
+
+  expect(onChange).toHaveBeenLastCalledWith('123456');
+  expect(onComplete).toHaveBeenCalledWith('123456');
+});
diff --git a/src/components/common/OtpInput.tsx b/src/components/common/OtpInput.tsx
index 1a6a8b175..b1cb9e447 100644
--- a/src/components/common/OtpInput.tsx
+++ b/src/components/common/OtpInput.tsx
@@ -27,8 +27,28 @@ export function OtpInput({ value, onChange, onComplete, disabled }: OtpInputProp
     }
   };
 
+  const applyPastedValue = (digitsStr: string) => {
+    const pasted = digitsStr.replace(/\D/g, '').slice(0, LENGTH);
+    const next = Array.from({ length: LENGTH }, (_, i) => pasted[i] ?? '');
+    const newVal = next.join('');
+    onChange(newVal);
+    if (newVal.length === LENGTH) {
+      onComplete?.(newVal);
+      focusInput(refs.current[LENGTH - 1]);
+    } else {
+      focusInput(refs.current[pasted.length]);
+    }
+  };
+
   const handleInput = (index: number, raw: string) => {
-    const char = raw.replace(/\D/g, '').slice(-1);
+    const digitsOnly = raw.replace(/\D/g, '');
+
+    if (digitsOnly.length > 1) {
+      applyPastedValue(digitsOnly);
+      return;
+    }
+
+    const char = digitsOnly;
     if (!char) return;
     update(index, char);
     if (index < LENGTH - 1) {
@@ -56,16 +76,7 @@ export function OtpInput({ value, onChange, onComplete, disabled }: OtpInputProp
 
   const handlePaste = (e: ClipboardEvent<HTMLInputElement & HTMLTextAreaElement>) => {
     e.preventDefault();
-    const pasted = e.clipboardData.getData('text').replace(/\D/g, '').slice(0, LENGTH);
-    const next = Array.from({ length: LENGTH }, (_, i) => pasted[i] ?? '');
-    const newVal = next.join('');
-    onChange(newVal);
-    if (newVal.length === LENGTH) {
-      onComplete?.(newVal);
-      focusInput(refs.current[LENGTH - 1]);
-    } else {
-      focusInput(refs.current[pasted.length]);
-    }
+    applyPastedValue(e.clipboardData.getData('text'));
   };
 
   return (