diff --git a/routes/timings.js b/routes/timings.js
index 2af5689..34aff79 100644
--- a/routes/timings.js
+++ b/routes/timings.js
@@ -18,21 +18,23 @@ router.post("/registration", async (req, res) => {
 
 router.post("/fido2-authentication", async (req, res) => {
   const { email, fido2AuthTimings } = req.body;
-
   try {
+    const now = Date.now()
+    const dateCreated = new Date(now).toISOString()
     // TODO: optimise
     const user = await User.findOne({ email: email });
     const timings = [
       ...user.fido2AuthTimings,
       {
         ...fido2AuthTimings,
-        date: Date.now().toLocaleDateString("en-US"),
+        date: dateCreated,
       },
     ];
+
     await User.findOneAndUpdate({ email: email }, { fido2AuthTimings: timings });
-    console.log('Captured timings for user ' + email, timings)
     return res.status(200).json({ status: "Success" });
   } catch (err) {
+    console.log(err)
     return res.status(500).json({ error: "Server error: " + err });
   }
 });
@@ -40,12 +42,15 @@ router.post("/fido2-authentication", async (req, res) => {
 router.post("/pw-authentication", async (req, res) => {
   const { email, passwordAuthTimings } = req.body;
   try {
+    const now = Date.now()
+    const dateCreated = new Date(now).toISOString()
+
     const user = await User.findOne({ email: email });
     const timings = [
       ...user.passwordAuthTimings,
       {
         ...passwordAuthTimings,
-        date: Date.now().toLocaleDateString("en-US"),
+        date: dateCreated,
       },
     ];
     await User.findOneAndUpdate({ email: email }, { passwordAuthTimings: timings });
diff --git a/server.js b/server.js
index b4e891d..1792590 100644
--- a/server.js
+++ b/server.js
@@ -57,7 +57,7 @@ app.use(
     resave: false,
     store: new MongoStore({ mongooseConnection: dbConnection.connection }),
     saveUninitialized: false,
-    cookie: { secure: true },
+    cookie: { secure: config.mode === 'production' },
   })
 );