diff --git a/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts b/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts
index 4696baf..a7a998a 100644
--- a/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts
+++ b/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts
@@ -1,8 +1,8 @@
 import { SourceType } from '@app/common/constants/source-type.enum';
-import { Entity, Column, PrimaryColumn, Index } from 'typeorm';
+import { Entity, Column, PrimaryColumn, Unique } from 'typeorm';
 
 @Entity('device-status-log')
-@Index('event_time_idx', ['eventTime'])
+@Unique('event_time_idx', ['eventTime'])
 export class DeviceStatusLogEntity {
   @Column({ type: 'int', generated: true, unsigned: true })
   id: number;
diff --git a/src/auth/services/user-auth.service.ts b/src/auth/services/user-auth.service.ts
index 9f9d82d..0c95297 100644
--- a/src/auth/services/user-auth.service.ts
+++ b/src/auth/services/user-auth.service.ts
@@ -256,11 +256,13 @@ export class UserAuthService {
       throw new BadRequestException('You entered wrong otp');
     }
 
-    if (otp.expiryTime < new Date() || fromNewPassword) {
+    if (otp.expiryTime < new Date()) {
       await this.otpRepository.delete(otp.uuid);
       throw new BadRequestException('OTP expired');
     }
-
+    if (fromNewPassword) {
+      await this.otpRepository.delete(otp.uuid);
+    }
     if (data.type == OtpType.VERIFICATION) {
       await this.userRepository.update(
         { email: data.email },