diff --git a/src/app/account/reset-password/page.tsx b/src/app/account/reset-password/page.tsx
index 0390dbf..fd3374b 100644
--- a/src/app/account/reset-password/page.tsx
+++ b/src/app/account/reset-password/page.tsx
@@ -2,32 +2,15 @@
 
 import './styles.css'
 import { Turnstile } from '@marsidev/react-turnstile'
-import { useEffect, useState } from 'react'
 import { DiscordButton } from '../../components/DiscordButton'
 import { HomeButton } from '../../components/HomeButton'
 import axios from 'axios'
-import { useRouter, useSearchParams } from 'next/navigation'
+import { Suspense, useState } from 'react'
+import { useSearchParams } from 'next/navigation'
 
-export default function CaptchaCodePage () {
+function ResetPasswordForm ({ codeParam }: { codeParam: string }) {
   const [token, setToken] = useState<string | null>(null)
-  const [code, setCode] = useState<string | null>(null)
   const [result, setResult] = useState<number>(-1)
-  const params = useSearchParams()
-  const router = useRouter()
-
-  if (!params.get('code'))
-    return (
-      <div className='box'>
-        <HomeButton />
-        <DiscordButton />
-        <p className='px-8 -mt-2 -mb-2 text-center'>No code provided</p>
-      </div>
-    )
-
-  useEffect(() => {
-    const code = params.get('code')
-    if (code) setCode(code as string)
-  }, [params])
 
   return (
     <div className='box'>
@@ -75,11 +58,10 @@ export default function CaptchaCodePage () {
             try {
               const result = await axios.post('/api/account/reset-password', {
                 token,
-                code,
+                code: codeParam,
                 password
               })
               if (result.data.success) {
-                setCode(result.data.data)
                 setResult(2)
               } else {
                 alert(
@@ -124,3 +106,29 @@ export default function CaptchaCodePage () {
     </div>
   )
 }
+
+export default function ResetPasswordPage () {
+  return (
+    <Suspense
+      fallback={<p className='px-8 -mt-2 -mb-2 text-center'>Loading...</p>}
+    >
+      <ResetPasswordPageWithParams />
+    </Suspense>
+  )
+}
+
+function ResetPasswordPageWithParams () {
+  const params = useSearchParams()
+  const code = params.get('code')
+
+  if (!code)
+    return (
+      <div className='box'>
+        <HomeButton />
+        <DiscordButton />
+        <p className='px-8 -mt-2 -mb-2 text-center'>No code provided</p>
+      </div>
+    )
+
+  return <ResetPasswordForm codeParam={code} />
+}