diff --git a/app.js b/app.js
index def6ffb..d3f14d7 100644
--- a/app.js
+++ b/app.js
@@ -224,7 +224,7 @@ app.post('/register', async (req, res) => {
 app.post('/login', async (req, res) => {
   const { username, password } = req.body;
   try {
-    const userResult = await pool.query("SELECT *, CASE WHEN admin_temp IS NOT NULL AND (now() - admin_temp) > interval '24 hours' THEN 'expired' ELSE 'valid' END AS admin_status FROM users WHERE username = $1", [ username]);
+    const userResult = await pool.query("SELECT *, CASE WHEN admin_temp IS NOT NULL AND (now() - admin_temp) > interval '22 hours' THEN 'expired' ELSE 'valid' END AS admin_status FROM users WHERE username = $1", [ username]);
     console.log(userResult.rows[0]);
     if (userResult.rows.length > 0) {
       const user = userResult.rows[0];
@@ -233,7 +233,7 @@ app.post('/login', async (req, res) => {
         if (user.is_active) {
           req.session.userId = user.id;
           if (user.admin_status === 'expired') {
-              await pool.query('UPDATE users SET role = $1, admin_temp = $2 WHERE id = $3', ['user', NULL , userId]);
+              await pool.query('UPDATE users SET role = $1, admin_temp = NULL WHERE id = $2', ['user', user.id]);
               req.session.role='user';    
             } else {
               req.session.role=user.role;