diff --git a/src/login/login.module.ts b/src/login/login.module.ts
index c31f30af502394105a5772fabdcbac2c54e55a6c..d7ab1bb84d9ed57786230c2a120fa9ad470b937e 100644
--- a/src/login/login.module.ts
+++ b/src/login/login.module.ts
@@ -15,7 +15,7 @@ import { JwtStrategy } from './jwt.strategy';
     PassportModule,
     JwtModule.register({
       secret: jwtConstants.secret,
-      signOptions: { expiresIn: '3600s' },
+      signOptions: { expiresIn: '300s' },
     }),
   ],
   controllers: [LoginController],
diff --git a/src/people/dao/people.dao.ts b/src/people/dao/people.dao.ts
index 65d909a0886854da504c834fd8f4947d01755258..33fd035045f70b36ddbd24d83c3c6093fc6db34c 100644
--- a/src/people/dao/people.dao.ts
+++ b/src/people/dao/people.dao.ts
@@ -25,21 +25,23 @@ export class PeopleDao {
     private readonly _peopleModel: Model<People>,
   ) {}
 
-  login = async (email: string, password: string): Promise<People | void> => {
-    try {
-      const user = await this._peopleModel.findOne({ email });
-      if (!user) {
-        throw new NotFoundException('Email or password is incorrect!');
-      }
-      const isPasswordCorrect = await bcrypt.compare(password, user.passwordHash);
-      if (!isPasswordCorrect) {
-        throw new NotFoundException('Email or password is incorrect!');
-      }
-      return user;
-    } catch (error) {
-      throw error;
-    }
-  };
+  login = (email: string, password: string): Promise<People | void> =>
+    new Promise(async (resolve, reject) => {
+      this._peopleModel.findOne({ email: email }, async (err, value) => {
+        if (err) reject(err.message);
+        if (!value)
+          reject(new NotFoundException('Email or password is incorrect!'));
+        const isPasswordCorrect = await bcrypt.compare(
+          password,
+          value.passwordHash,
+        );
+        if (!isPasswordCorrect) {
+          reject(new NotFoundException('Email or password is incorrect!'));
+        }
+        value.passwordHash = password
+        resolve(value);
+      });
+    });
 
   find = (): Promise<People[]> =>
     new Promise((resolve, reject) => {