diff --git a/src/admin/context/AuthContext.tsx b/src/admin/context/AuthContext.tsx
index e558db7..f9e718f 100644
--- a/src/admin/context/AuthContext.tsx
+++ b/src/admin/context/AuthContext.tsx
@@ -198,7 +198,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         credentials: 'include',
-        body: JSON.stringify({ login_token: loginToken, totp_code: code }),
+        body: JSON.stringify({ login_token: loginToken, totp_code: code, remember_me: remember }),
       })
       const data = await response.json()
       if (data.success) {
diff --git a/src/routes/admin/auth.ts b/src/routes/admin/auth.ts
index 499a631..295b0f5 100644
--- a/src/routes/admin/auth.ts
+++ b/src/routes/admin/auth.ts
@@ -76,6 +76,8 @@ export default async function authRoutes(fastify: FastifyInstance): Promise<void
     const parsed = parseBody(TotpVerifySchema, request.body);
     if ('error' in parsed) return error(reply, parsed.error, 400);
     const { login_token, totp_code } = parsed.data;
+    const rawBody = request.body as unknown as Record<string, unknown>;
+    const rememberMe = rawBody.remember_me === true || rawBody.remember_me === 'true';
 
     const tokenHash = crypto.createHash('sha256').update(login_token).digest('hex');
 
@@ -127,18 +129,22 @@ export default async function authRoutes(fastify: FastifyInstance): Promise<void
     const refreshTokenRaw = crypto.randomBytes(32).toString('hex');
     const refreshTokenHash = crypto.createHash('sha256').update(refreshTokenRaw).digest('hex');
 
+    const expiresIn = rememberMe
+      ? config.jwt.refreshTokenRememberExpiry
+      : config.jwt.refreshTokenSessionExpiry;
+
     await prisma.refresh_tokens.create({
       data: {
         user_id: user.id,
         token_hash: refreshTokenHash,
-        expires_at: new Date(Date.now() + config.jwt.refreshTokenSessionExpiry * 1000),
-        remember_me: false,
+        expires_at: new Date(Date.now() + expiresIn * 1000),
+        remember_me: rememberMe,
         ip_address: request.ip,
         user_agent: request.headers['user-agent'] ?? null,
       },
     });
 
-    setRefreshCookie(reply, refreshTokenRaw, false);
+    setRefreshCookie(reply, refreshTokenRaw, rememberMe);
     return success(reply, { access_token: accessToken, user: authData });
   });