diff --git a/src/routes/login/index.tsx b/src/routes/login/index.tsx
index 1c980fe..bbae566 100644
--- a/src/routes/login/index.tsx
+++ b/src/routes/login/index.tsx
@@ -552,7 +552,54 @@ export default function LoginPage() {
                 Login Success! Redirecting...
               </Show>
             </div>
+            {/* Code Input Section */}
+            <Show when={emailSent() && !register() && !usePassword()}>
+              <div class="bg-surface0 text-text mx-auto mt-6 w-full max-w-md rounded-lg border p-6">
+                <h3 class="mb-2 text-center text-lg font-semibold">
+                  Enter Your Code
+                </h3>
+                <p class="text-surface2 mb-2 text-center text-sm">
+                  Check your email for a 6-digit code
+                </p>
+                <p class="text-surface2 mb-4 text-center text-xs italic">
+                  Code expires in{" "}
+                  {expiryToHuman(AUTH_CONFIG.EMAIL_LOGIN_LINK_EXPIRY)}
+                </p>
 
+                <form onSubmit={handleCodeSubmit} class="flex flex-col gap-4">
+                  <div>
+                    <input
+                      type="text"
+                      value={loginCode()}
+                      onInput={(e) =>
+                        setLoginCode(
+                          e.currentTarget.value.replace(/\D/g, "").slice(0, 6)
+                        )
+                      }
+                      placeholder="000000"
+                      maxLength={6}
+                      class="text-blue mx-auto block w-48 rounded-lg border border-zinc-300 bg-white px-4 py-3 text-center text-2xl font-bold tracking-widest dark:border-zinc-600 dark:bg-zinc-900"
+                      autocomplete="off"
+                    />
+                  </div>
+
+                  <Show when={codeError()}>
+                    <div class="text-red text-center text-sm">
+                      {codeError()}
+                    </div>
+                  </Show>
+
+                  <Button
+                    type="submit"
+                    loading={codeLoading()}
+                    disabled={loginCode().length !== 6}
+                    class="mx-auto w-full"
+                  >
+                    Verify Code
+                  </Button>
+                </form>
+              </div>
+            </Show>
             <div class="flex justify-center py-4">
               <Show
                 when={
@@ -630,53 +677,6 @@ export default function LoginPage() {
             <Show when={emailSent()}>Email Sent!</Show>
           </div>
 
-          {/* Code Input Section */}
-          <Show when={emailSent() && !register() && !usePassword()}>
-            <div class="bg-surface0 text-text mx-auto mt-6 w-full max-w-md rounded-lg border p-6">
-              <h3 class="mb-2 text-center text-lg font-semibold">
-                Enter Your Code
-              </h3>
-              <p class="text-surface2 mb-2 text-center text-sm">
-                Check your email for a 6-digit code
-              </p>
-              <p class="text-surface2 mb-4 text-center text-xs italic">
-                Code expires in{" "}
-                {expiryToHuman(AUTH_CONFIG.EMAIL_LOGIN_LINK_EXPIRY)}
-              </p>
-
-              <form onSubmit={handleCodeSubmit} class="flex flex-col gap-4">
-                <div>
-                  <input
-                    type="text"
-                    value={loginCode()}
-                    onInput={(e) =>
-                      setLoginCode(
-                        e.currentTarget.value.replace(/\D/g, "").slice(0, 6)
-                      )
-                    }
-                    placeholder="000000"
-                    maxLength={6}
-                    class="text-blue mx-auto block w-48 rounded-lg border border-zinc-300 bg-white px-4 py-3 text-center text-2xl font-bold tracking-widest dark:border-zinc-600 dark:bg-zinc-900"
-                    autocomplete="off"
-                  />
-                </div>
-
-                <Show when={codeError()}>
-                  <div class="text-red text-center text-sm">{codeError()}</div>
-                </Show>
-
-                <Button
-                  type="submit"
-                  loading={codeLoading()}
-                  disabled={loginCode().length !== 6}
-                  class="mx-auto w-full"
-                >
-                  Verify Code
-                </Button>
-              </form>
-            </div>
-          </Show>
-
           <div class="rule-around text-center">Or</div>
 
           <div class="my-2 flex justify-center">
diff --git a/src/server/session-config.ts b/src/server/session-config.ts
index 58ac65e..7d4d058 100644
--- a/src/server/session-config.ts
+++ b/src/server/session-config.ts
@@ -27,13 +27,12 @@ export interface SessionData {
  */
 export const sessionConfig: SessionConfig = {
   password: env.JWT_SECRET_KEY,
-  cookieName: "session",
-  cookieOptions: {
+  name: "session",
+  cookie: {
     httpOnly: true,
     secure: env.NODE_ENV === "production",
     sameSite: "strict",
     path: "/"
-    // maxAge is set dynamically based on rememberMe
   }
 };
 
@@ -43,7 +42,7 @@ export const sessionConfig: SessionConfig = {
  */
 export function getSessionCookieOptions(rememberMe: boolean) {
   return {
-    ...sessionConfig.cookieOptions,
+    ...sessionConfig.cookie,
     maxAge: rememberMe
       ? expiryToSeconds(AUTH_CONFIG.REFRESH_TOKEN_EXPIRY_LONG)
       : undefined // Session cookie (expires on browser close)