diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1733408604468-fixUserEmailUniqueConstraint.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1733408604468-fixUserEmailUniqueConstraint.ts
new file mode 100644
index 000000000..83fd297be
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1733408604468-fixUserEmailUniqueConstraint.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class FixUserEmailUniqueConstraint1733408604468
+  implements MigrationInterface
+{
+  name = 'FixUserEmailUniqueConstraint1733408604468';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" DROP CONSTRAINT "UQ_USER_EMAIL"`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "UQ_USER_EMAIL" ON "core"."user" ("email") WHERE "deletedAt" IS NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "core"."UQ_USER_EMAIL"`);
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ADD CONSTRAINT "UQ_USER_EMAIL" UNIQUE ("email", "deletedAt")`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
index fbd86f127..8d1ac3433 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
@@ -5,11 +5,11 @@ import {
   Column,
   CreateDateColumn,
   Entity,
+  Index,
   ManyToOne,
   OneToMany,
   PrimaryGeneratedColumn,
   Relation,
-  Unique,
   UpdateDateColumn,
 } from 'typeorm';
 
@@ -28,7 +28,10 @@ registerEnumType(OnboardingStatus, {
 
 @Entity({ name: 'user', schema: 'core' })
 @ObjectType('User')
-@Unique('UQ_USER_EMAIL', ['email', 'deletedAt'])
+@Index('UQ_USER_EMAIL', ['email'], {
+  unique: true,
+  where: '"deletedAt" IS NULL',
+})
 export class User {
   @IDField(() => UUIDScalarType)
   @PrimaryGeneratedColumn('uuid')