diff --git a/.gitignore b/.gitignore
index 3cec7441f..408f361cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ zxing-cpp/data/zxing-cpp
 # Used in test
 7fdad8b1*
 
+CONTEXT.md
diff --git a/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/TenantWarningService.java b/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/TenantWarningService.java
index 905b9f610..78f8afc74 100644
--- a/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/TenantWarningService.java
+++ b/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/TenantWarningService.java
@@ -80,14 +80,18 @@ private void handleWarning2(Tenant t) {
     }
 
     private void handleWarning1(Tenant t) {
-        mailSender.sendEmailSecondWarningForDeletionOfDocuments(t, confirmationTokenService.createToken(t));
+        var confirmationToken = confirmationTokenRepository.findByUser(t).orElse(new ConfirmationToken(t));
+
+        mailSender.sendEmailSecondWarningForDeletionOfDocuments(t, confirmationToken);
         t.setWarnings(2);
         tenantRepository.save(t);
         logService.saveLog(LogType.SECOND_ACCOUNT_WARNING_FOR_DOCUMENT_DELETION, t.getId());
     }
 
     private void handleWarning0(Tenant t) {
-        mailSender.sendEmailFirstWarningForDeletionOfDocuments(t, confirmationTokenService.createToken(t));
+        var confirmationToken = confirmationTokenRepository.findByUser(t).orElse(new ConfirmationToken(t));
+
+        mailSender.sendEmailFirstWarningForDeletionOfDocuments(t, confirmationToken);
         t.setWarnings(1);
         tenantRepository.save(t);
         logService.saveLog(LogType.FIRST_ACCOUNT_WARNING_FOR_DOCUMENT_DELETION, t.getId());