diff --git a/src/client/pages/auth/login.tsx b/src/client/pages/auth/login.tsx
index bc0a5f96..0f353363 100644
--- a/src/client/pages/auth/login.tsx
+++ b/src/client/pages/auth/login.tsx
@@ -128,6 +128,12 @@ export default function Login() {
     }
   };
 
+  const handleTotpChange = async (val: string) => {
+    setTotp('pin', val);
+
+    if (val.length === 6) await handleLoginSubmit(form.values, val);
+  };
+
   if (configLoading || !config) return <LoadingOverlay visible />;
   if (configError) return <GenericError title='Error' message='Config load failed' details={configError} />;
 
@@ -139,7 +145,7 @@ export default function Login() {
 
       <TotpModal
         state={totp}
-        onPinChange={(val) => setTotp('pin', val)}
+        onPinChange={(val) => handleTotpChange(val)}
         onVerify={() => handleLoginSubmit(form.values, totp.pin)}
         onCancel={() => {
           setTotp('open', false);
diff --git a/src/components/pages/login/TotpModal.tsx b/src/components/pages/login/TotpModal.tsx
index 300147f6..c77a7801 100644
--- a/src/components/pages/login/TotpModal.tsx
+++ b/src/components/pages/login/TotpModal.tsx
@@ -14,32 +14,39 @@ export default function TotpModal({
 }) {
   return (
     <Modal onClose={onCancel} title='Enter code' opened={state.open} withCloseButton={false}>
-      <Center>
-        <PinInput
-          length={6}
-          oneTimeCode
-          type='number'
-          onChange={onPinChange}
-          error={!!state.error}
-          disabled={state.disabled}
-          size='xl'
-          autoFocus
-        />
-      </Center>
-      {state.error && (
-        <Text ta='center' size='sm' c='red' mt='xs'>
-          {state.error}
-        </Text>
-      )}
+      <form onSubmit={onVerify}>
+        <Center>
+          <PinInput
+            length={6}
+            oneTimeCode
+            type='number'
+            onChange={onPinChange}
+            error={!!state.error}
+            disabled={state.disabled}
+            size='xl'
+            autoFocus
+          />
+        </Center>
+        {state.error && (
+          <Text ta='center' size='sm' c='red' mt='xs'>
+            {state.error}
+          </Text>
+        )}
 
-      <Group mt='sm' grow>
-        <Button leftSection={<IconX size='1rem' />} color='red' variant='outline' onClick={onCancel}>
-          Cancel
-        </Button>
-        <Button leftSection={<IconShieldQuestion size='1rem' />} loading={state.disabled} onClick={onVerify}>
-          Verify
-        </Button>
-      </Group>
+        <Group mt='sm' grow>
+          <Button leftSection={<IconX size='1rem' />} color='red' variant='outline' onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button
+            leftSection={<IconShieldQuestion size='1rem' />}
+            loading={state.disabled}
+            onClick={onVerify}
+            type='submit'
+          >
+            Verify
+          </Button>
+        </Group>
+      </form>
     </Modal>
   );
 }
diff --git a/src/lib/totp.ts b/src/lib/totp.ts
index f05a56e4..b3ef3caf 100644
--- a/src/lib/totp.ts
+++ b/src/lib/totp.ts
@@ -1,18 +1,20 @@
 import { generateSecret, generateURI, verify } from 'otplib';
 import { toDataURL } from 'qrcode';
 
-export function generateKey() {
+export function generateKey(): string {
   return generateSecret({
     length: 16,
   });
 }
 
-export async function verifyTotpCode(code: string, secret: string) {
-  return verify({
+export async function verifyTotpCode(code: string, secret: string): Promise<boolean> {
+  const result = await verify({
     secret,
     token: code,
     epochTolerance: 30,
   });
+
+  return result.valid;
 }
 
 export function totpQrcode({
@@ -23,7 +25,7 @@ export function totpQrcode({
   issuer?: string;
   username: string;
   secret: string;
-}) {
+}): Promise<string> {
   return toDataURL(
     generateURI({
       secret,