diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index 9d61bf989..8b6c3d2ca 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -35,8 +35,8 @@ export class AuthService {
   }
 
   async login(user: Omit<User, "password">): Promise<Record<string, unknown>> {
-    const accessToken = this.jwtService.sign(user);
     const expiresIn = this.configService.get<number>("jwt.expiresIn");
+    const accessToken = this.jwtService.sign(user, { expiresIn });
     return {
       access_token: accessToken,
       id: accessToken,
diff --git a/src/policies/policies.service.ts b/src/policies/policies.service.ts
index 7de896b6a..ca56c0e1d 100644
--- a/src/policies/policies.service.ts
+++ b/src/policies/policies.service.ts
@@ -113,10 +113,15 @@ export class PoliciesService implements OnModuleInit {
   }
 
   async create(createPolicyDto: CreatePolicyDto): Promise<Policy> {
-    const username = (this.request.user as JWTUser).username;
+    const username = (this.request.user as JWTUser)?.username;
+    if (!username) {
+      throw new UnauthorizedException("User not present in the request");
+    }
+
     const createdPolicy = new this.policyModel(
       addCreatedByFields(createPolicyDto, username),
     );
+
     return createdPolicy.save();
   }