diff --git a/config/stag.json b/config/stag.json
index b1a46a1..c42e0e4 100644
--- a/config/stag.json
+++ b/config/stag.json
@@ -28,8 +28,8 @@
         "database": "bri_erp_staging"
     },
     "auth": {
-        "refresh_token_lifetime_day": 30,
-        "access_token_lifetime": 86400,
+        "refresh_token_lifetime_day": 1,
+        "access_token_lifetime": 900,
         "reset_password_url": "https://brilianapps.shiblysolution.id/ukln/auth/reset-password/"
     },
     "service": {
diff --git a/src/controllers/auth.ts b/src/controllers/auth.ts
index 98f0aaf..99ba414 100644
--- a/src/controllers/auth.ts
+++ b/src/controllers/auth.ts
@@ -14,6 +14,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { EmailBody, Menu, User, UserRefreshToken, UserRole } from "entity";
 import axios from 'axios';
 import CommonHelper from "../helpers/common";
+import { MoreThan } from "typeorm";
 
 const log: Logger<ILogObj> = new Logger({ name: '[UserController]', type: 'pretty' });
 
@@ -314,7 +315,7 @@ export class AuthController {
 
             const userRefreshTokenRepo = OrmHelper.DB.getRepository(UserRefreshToken);
 
-            const refresh_token = await userRefreshTokenRepo.findOneBy({ refresh_token: param.refresh_token });
+            const refresh_token = await userRefreshTokenRepo.findOneBy({ refresh_token: param.refresh_token, expired_at: MoreThan(new Date()) });
 
             if (refresh_token != null) {
                 const userRepo = OrmHelper.DB.getRepository(User);
diff --git a/src/controllers/user_activity.ts b/src/controllers/user_activity.ts
index 7efba70..280af2c 100644
--- a/src/controllers/user_activity.ts
+++ b/src/controllers/user_activity.ts
@@ -88,7 +88,7 @@ export class UserActivityController {
             const { whereAttr, whereVal } = CommonHelper.handleFilter({
                 filter: param.filter,
                 col_any_eq: [],
-                col_any_like: ['module', 'description'],
+                col_any_like: ['u.username', 'module', 'description'],
                 additional_where: !param.all_user ? 'id_user = :id_user' : ''
             });