diff --git a/source/server/routes/auth/login.test.ts b/source/server/routes/auth/login.test.ts
index 9f5b10b0..6a6e6238 100644
--- a/source/server/routes/auth/login.test.ts
+++ b/source/server/routes/auth/login.test.ts
@@ -21,13 +21,20 @@ describe("/auth/login", function(){
   });
 
   it("sets a cookie", async function(){
+    const maxAge = this.server.locals.sessionMaxAge;
     this.agent = request.agent(this.server);
-    await this.agent.post("/auth/login")
+    let res = await this.agent.post("/auth/login")
     .send({username: user.username, password: "12345678"})
     .set("Content-Type", "application/json")
     .set("Accept", "")
     .expect(200)
     .expect('set-cookie', /session=/);
+
+    let expiresText = /expires=([^;]+);/.exec(res.headers["set-cookie"]);
+    expect(expiresText, `expected regex to match ${res.headers["set-cookie"]}`).to.be.ok;
+    let expiresDate = new Date((expiresText as any)[1]);
+    expect(expiresDate.valueOf()).to.be.above(Date.now()+maxAge-2000);
+    expect(expiresDate.valueOf()).to.be.below(Date.now()+ maxAge + 1);
   });
 
   it("can get login status (not connected)", async function(){
@@ -187,6 +194,7 @@ describe("/auth/login", function(){
     });
 
     it("obtains a valid login link (text/plain)", async function(){
+      const maxAge = this.server.locals.sessionMaxAge;
       let res = await request(this.server).get(`/auth/login/${user.username}/link`)
       .set("Authorization", `Basic ${Buffer.from(`${admin.username}:12345678`).toString("base64")}`)
       .set("Accept", "text/plain")
@@ -195,10 +203,23 @@ describe("/auth/login", function(){
 
       expect(res.text).to.match(/^http:/);
       let url = new URL(res.text);
-      await request(this.server).get(url.pathname+url.search)
+
+      const agent = request.agent(this.server);
+      res = await agent.get(url.pathname+url.search)
       .expect(302)
       .expect("Set-Cookie", /session=/)
       .expect("Location", "/");
+
+      let expiresText = /expires=([^;]+);/.exec(res.headers["set-cookie"]);
+      expect(expiresText, `expected regex to match ${res.headers["set-cookie"]}`).to.be.ok;
+      let expiresDate = new Date((expiresText as any)[1]);
+      expect(expiresDate.valueOf()).to.be.above(Date.now() + maxAge - 1000);
+
+      //Verifies that the authentication does actually work
+      res = await agent.get("/auth/login")
+      .set("Accept", "application/json")
+      .expect(200);
+      expect(res.body).to.have.property("username", user.username);
     });
 
     it("obtains a valid login link (application/json)", async function(){
diff --git a/source/server/routes/auth/login.ts b/source/server/routes/auth/login.ts
index f860f5ca..9bcad3bc 100644
--- a/source/server/routes/auth/login.ts
+++ b/source/server/routes/auth/login.ts
@@ -62,7 +62,11 @@ export async function getLogin(req :Request, res:Response){
     console.log((e as any).message);
     throw new BadRequestError(`Failed to parse login payload`);
   }
-  Object.assign((req as any).session as any, User.safe(user));
+  Object.assign(
+    (req as any).session as any,
+    {expires: Date.now() + getLocals(req).sessionMaxAge },
+    User.safe(user),
+  );
   if(redirect && typeof redirect === "string"){
     return res.redirect(302, redirect );
   }else{
diff --git a/source/server/routes/index.ts b/source/server/routes/index.ts
index b7552860..9676cd60 100644
--- a/source/server/routes/index.ts
+++ b/source/server/routes/index.ts
@@ -49,7 +49,7 @@ export default async function createServer(config = defaultConfig) :Promise<expr
     setInterval(()=>{
       vfs.optimize();
     }, 2*3600*1000).unref();
-  } 
+  }
 
 
   app.locals  = Object.assign(app.locals, {
@@ -58,14 +58,14 @@ export default async function createServer(config = defaultConfig) :Promise<expr
     vfs,
     templates,
     config,
-    sessionMaxAge: 31 * 24 * 60 * 60*1000 // 1 month, in seconds
+    sessionMaxAge: 31 * 24 * 60 * 60*1000 // 1 month, in milliseconds
   }) as AppLocals;
 
   app.use(cookieSession({
     name: 'session',
     keys: await userManager.getKeys(),
     // Cookie Options
-    maxAge: (app.locals as AppLocals).sessionMaxAge * 1000,
+    maxAge: (app.locals as AppLocals).sessionMaxAge,
     sameSite: "strict"
   }));