diff --git a/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx b/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx
index 7a493d5b0..fa5d223d8 100644
--- a/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx
+++ b/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx
@@ -139,31 +139,6 @@ export const EnableAuthenticatorAppDialog = ({
     }
   };
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const onPinInputChange = ({ currentTarget: input }: any) => {
-    input.value = input.value.replace(/\D+/g, '');
-
-    if (input.value.length === 6) {
-      setState('loading');
-
-      void onEnableTwoFactorAuthenticationFormSubmit({ token: input.value }).then((success) => {
-        if (success) {
-          setState('success');
-          return;
-        }
-
-        setState('error');
-
-        setTimeout(() => {
-          setState('input');
-          input.value = '';
-          input.dispatchEvent(new Event('input'));
-          input.focus();
-        }, 500);
-      });
-    }
-  };
-
   const onCompleteClick = () => {
     flushSync(() => {
       onOpenChange(false);
@@ -273,7 +248,36 @@ export const EnableAuthenticatorAppDialog = ({
                     <FormItem>
                       <FormLabel className="text-muted-foreground">Token</FormLabel>
                       <FormControl>
-                        <PinInput id="remix" state={state} onChange={onPinInputChange} autoFocus />
+                        <PinInput
+                          id="enable-2fa-pin-input"
+                          state={state}
+                          onSubmit={({ code, input }) => {
+                            console.log(code);
+
+                            if (code.length === 6) {
+                              setState('loading');
+
+                              void onEnableTwoFactorAuthenticationFormSubmit({ token: code }).then(
+                                (success) => {
+                                  if (success) {
+                                    setState('success');
+                                    return;
+                                  }
+
+                                  setState('error');
+
+                                  setTimeout(() => {
+                                    setState('input');
+                                    input.value = '';
+                                    input.dispatchEvent(new Event('input'));
+                                    input.focus();
+                                  }, 500);
+                                },
+                              );
+                            }
+                          }}
+                          autoFocus
+                        />
                       </FormControl>
                       <FormMessage />
                     </FormItem>
diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx
index ec690a568..b182d5d76 100644
--- a/apps/web/src/components/forms/signin.tsx
+++ b/apps/web/src/components/forms/signin.tsx
@@ -31,6 +31,7 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
 import { PasswordInput } from '@documenso/ui/primitives/password-input';
+import { PinInput, type PinInputState } from '@documenso/ui/primitives/pin-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 const ERROR_MESSAGES: Partial<Record<keyof typeof ErrorCode, string>> = {
@@ -72,6 +73,7 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
   const [twoFactorAuthenticationMethod, setTwoFactorAuthenticationMethod] = useState<
     'totp' | 'backup'
   >('totp');
+  const [state, setState] = useState<PinInputState>('input');
 
   const form = useForm<TSignInFormSchema>({
     values: {
@@ -151,18 +153,24 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
           title: 'Unable to sign in',
           description: errorMessage ?? 'An unknown error occurred',
         });
-
-        return;
       }
 
+      setState('success');
+      console.log(result);
+
       if (!result?.url) {
         throw new Error('An unknown error occurred');
       }
 
       window.location.href = result.url;
     } catch (err) {
+      form.setError('totpCode', {
+        message: 'invalid totp',
+      });
+
       toast({
         title: 'An unknown error occurred',
+        variant: 'destructive',
         description:
           'We encountered an unknown error while attempting to sign you In. Please try again later.',
       });
@@ -254,7 +262,7 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
         open={isTwoFactorAuthenticationDialogOpen}
         onOpenChange={onCloseTwoFactorAuthenticationDialog}
       >
-        <DialogContent>
+        <DialogContent className="w-full max-w-md md:max-w-md lg:max-w-md">
           <DialogHeader>
             <DialogTitle>Two-Factor Authentication</DialogTitle>
           </DialogHeader>
@@ -265,13 +273,38 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
                 <FormField
                   control={form.control}
                   name="totpCode"
-                  render={({ field }) => (
+                  render={({ field: _field }) => (
                     <FormItem>
                       <FormLabel>Authentication Token</FormLabel>
                       <FormControl>
-                        <Input type="text" {...field} />
+                        <PinInput
+                          id="verify-2fa-signin-pin-input"
+                          state={state}
+                          onSubmit={async ({ code, input }) => {
+                            if (code.length === 6) {
+                              setState('loading');
+                              form.setValue('totpCode', code);
+
+                              await form.handleSubmit(onFormSubmit)();
+
+                              if (form.formState.isSubmitted && !form.formState.errors.totpCode) {
+                                setState('success');
+                                return;
+                              }
+
+                              setState('error');
+
+                              setTimeout(() => {
+                                setState('input');
+                                input.value = '';
+                                input.dispatchEvent(new Event('input'));
+                                input.focus();
+                              }, 500);
+                            }
+                          }}
+                          autoFocus
+                        />
                       </FormControl>
-                      <FormMessage />
                     </FormItem>
                   )}
                 />
diff --git a/packages/ui/primitives/pin-input.tsx b/packages/ui/primitives/pin-input.tsx
new file mode 100644
index 000000000..b29d64376
--- /dev/null
+++ b/packages/ui/primitives/pin-input.tsx
@@ -0,0 +1,85 @@
+'use client';
+
+import { useRef } from 'react';
+
+import { CodeInput, getSegmentCssWidth } from 'rci';
+import { useIsFocused } from 'use-is-focused';
+
+import { cn } from '@documenso/ui/lib/utils';
+
+export type PinInputState = 'input' | 'loading' | 'error' | 'success';
+export type PinInputProps = {
+  id: string;
+  state: PinInputState;
+  autoFocus?: boolean;
+  onSubmit({ code, input }: { code: string; input: EventTarget & HTMLInputElement }): void;
+};
+
+const PinInput = ({ id, autoFocus, state, onSubmit }: PinInputProps) => {
+  const inputRef = useRef<HTMLInputElement>(null);
+  const focused = useIsFocused(inputRef);
+
+  const width = getSegmentCssWidth('14px');
+
+  return (
+    <CodeInput
+      id={id}
+      className={cn({
+        'motion-safe:animate-[shake_0.15s_ease-in-out_0s_2]': state === 'error',
+      })}
+      inputClassName="caret-transparent selection:bg-transparent ring:ring-2"
+      autoFocus={autoFocus}
+      length={6}
+      fontFamily="Inter"
+      fontSize="36px"
+      readOnly={state !== 'input'}
+      disabled={state === 'loading'}
+      inputRef={inputRef}
+      padding={'14px'}
+      spacing={'18px'}
+      spellCheck={false}
+      inputMode="numeric"
+      pattern="[0-9]*"
+      autoComplete="one-time-code"
+      onChange={({ currentTarget: input }) => {
+        input.value = input.value.replace(/\D+/g, '');
+        onSubmit({ code: input.value, input });
+      }}
+      renderSegment={(segment) => {
+        const isCaret = focused && segment.state === 'cursor';
+        const isSelection = focused && segment.state === 'selected';
+        const isLoading = state === 'loading';
+        const isSuccess = state === 'success';
+        const isError = state === 'error';
+        const isActive = isSuccess || isError || isSelection || isCaret;
+
+        return (
+          <div
+            key={segment.index}
+            data-state={state}
+            className={cn(
+              'border-input flex appearance-none rounded-md border [--segment-color:#a2e771] data-[state="error"]:[--segment-color:#dc2626] data-[state="success"]:[--segment-color:#a2e771]',
+              {
+                'shadow-[var(--segment-color)_0_0_0_1px] data-[state]:border-[var(--segment-color)]':
+                  isActive,
+                'animate-[pulse-border_1s_ease-in-out_0s_infinite]': isLoading,
+              },
+            )}
+            style={{ width }}
+          >
+            <div
+              className={cn({
+                'm-[5px] flex-1 rounded-sm bg-[var(--segment-color)] opacity-[0.15625]':
+                  isSelection,
+                'mx-auto  my-2 flex-[0_0_2px] animate-[blink-caret_1.2s_step-end_infinite] justify-self-center bg-black':
+                  isCaret,
+              })}
+            />
+          </div>
+        );
+      }}
+    />
+  );
+};
+
+export { PinInput };
diff --git a/packages/ui/styles/theme.css b/packages/ui/styles/theme.css
index fe7bfa087..15c6a2f8d 100644
--- a/packages/ui/styles/theme.css
+++ b/packages/ui/styles/theme.css
@@ -114,3 +114,25 @@
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
   background: rgb(100 116 139 / 0.5);
 }
+
+@keyframes blink-caret {
+  50% {
+    background: transparent;
+  }
+}
+
+@keyframes shake {
+  25% {
+    transform: translateX(10px);
+  }
+  75% {
+    transform: translateX(-10px);
+  }
+}
+
+@keyframes pulse-border {
+  50% {
+    border-color: var(--segment-color);
+    box-shadow: var(--segment-color) 0 0 0 1px;
+  }
+}