diff --git a/src/Controller/EFNCController.php b/src/Controller/EFNCController.php
index df53829..51f7d77 100755
--- a/src/Controller/EFNCController.php
+++ b/src/Controller/EFNCController.php
@@ -93,7 +93,7 @@ public function formModificationDisplay(int $efncID, Request $request): Response
         } else if ($request->getMethod() == 'POST') {
             if ($this->getUser() !== null) {
                 if ($this->authChecker->isGranted('ROLE_ADMIN')) {
-                    $user = $this->getUser();
+                    $user = $this->getUser()->getUsername();
                     $form1->handleRequest($request);
                     if ($form1->isValid() && $form1->isSubmitted()) {
                         $result = $this->formModificationService->modifyNCForm(
@@ -151,7 +151,8 @@ public function closeEntity(Request $request, string $entityType, int $id): Resp
 
         if ($this->getUser() !== null) {
             if ($this->authChecker->isGranted('ROLE_MASTER_ADMIN')) {
-                $result = $this->entityDeletionService->closeEntity($entityType, $id); // Implement this method in your service
+                $user = $this->getUser()->getUsername();
+                $result = $this->entityDeletionService->closeEntity($entityType, $id, $commentary = null, $user); // Implement this method in your service
                 if ($result == false) {
                     $this->addFlash('danger', 'L\'élément n\'a pas pu être clôturé');
                     return $this->redirectToRoute('app_base', []);
diff --git a/src/Service/EntityDeletionService.php b/src/Service/EntityDeletionService.php
index 6c4bb1f..6c5bcd3 100755
--- a/src/Service/EntityDeletionService.php
+++ b/src/Service/EntityDeletionService.php
@@ -533,7 +533,7 @@ public function unarchiveEntity(string $entityType, int $id): bool
     }
 
 
-    public function closeEntity(string $entityType, int $id): bool
+    public function closeEntity(string $entityType, int $id, string $commentary = null, string $user = null): bool
     {
         $repository = null;
         switch ($entityType) {
@@ -553,6 +553,7 @@ public function closeEntity(string $entityType, int $id): bool
         }
 
         if ($entityType === 'efnc') {
+            $entity->setLastModifier($user);
             $entity->setArchived(true);
             $entity->setStatus(true);
         }
diff --git a/src/Service/FormModificationService.php b/src/Service/FormModificationService.php
index 227cfb3..27279cb 100755
--- a/src/Service/FormModificationService.php
+++ b/src/Service/FormModificationService.php
@@ -50,7 +50,8 @@ public function __construct(
     public function modifyNCForm(
         EFNC $efnc,
         Request $request,
-        FormInterface $form1
+        FormInterface $form1,
+        string $user = null
     ) {
         $now = new \DateTime();
 
diff --git a/templates/services/efnc/modification/form_modification.html.twig b/templates/services/efnc/modification/form_modification.html.twig
index af65351..1d6303a 100755
--- a/templates/services/efnc/modification/form_modification.html.twig
+++ b/templates/services/efnc/modification/form_modification.html.twig
@@ -171,70 +171,95 @@
 								class="d-grid gap-2 d-md-flex justify-content-md-center mt-5 text-white">
 								Derniere modification effectué par
 
-								{{ EFNC.LastModifier.username|capitalize|split('.')|first }}
-								{{ EFNC.LastModifier.username|upper|split('.')|last }}
+								{{ EFNC.LastModifier|capitalize|split('.')|first }}
+								{{ EFNC.LastModifier|upper|split('.')|last }}
 							</div>
 					{% endif %}
-					<div
-						class="d-grid gap-2 d-md-flex justify-content-md-center mt-1 textwhite">
-						<button
-							type="submit"
-							class="btn btn-primary mb-3 submit-EFNCform-modification">
-							Modifier
-						</button>
-					</div>
+					{% if EFNC.archived is null and EFNC.status is null %}
+						<div
+							class="d-grid gap-2 d-md-flex justify-content-md-center mt-3 textwhite">
+							<button
+								type="submit"
+								class="btn btn-primary mb-1 submit-EFNCform-modification">
+								Modifier
+							</button>
+						</div>
+					{% endif %}
 
 
 				{% endif %}
 			</div>
 			{{ form_end(form1) }}
-			<form
-				method="post"
-				action="{{ path('app_archive_entity', {entityType: 'efnc', id: EFNC.id}) }}">
+			{% if EFNC.archived is null and EFNC.status is null %}
+
+				<form
+					method="post"
+					action="{{ path('app_archive_entity', {entityType: 'efnc', id: EFNC.id}) }}">
 
-				<div
-					class="container mt-2 mb-2"
-					data-controller="archiving-commentary">
 					<div
-						class="row justify-content-md-center">
+						class="container mt-2 mb-2"
+						data-controller="archiving-commentary">
 						<div
-							class="col-md-12">
-							<label
-								for="archivingCommentary"
-								class="form-label text-white">
-								Commentaire d'archivage obligatoire
-								<div
-									data-archiving-commentary-target="archivingCommentaryMessage"
-									class="archivingCommentaryMessage-message d-flex justify-content-evenly"></div>
-							</label>
-							<textarea
-								class="form-control"
-								id="archivingCommentary"
-								name="archivingCommentary"
-								data-archiving-commentary-target="archivingCommentary"
-								data-action="keyup->archiving-commentary#archivingCommentary"></textarea>
+							class="row justify-content-md-center">
+							<div
+								class="col-md-12">
+								<label
+									for="archivingCommentary"
+									class="form-label text-white">
+									Commentaire d'archivage obligatoire
+									<div
+										data-archiving-commentary-target="archivingCommentaryMessage"
+										class="archivingCommentaryMessage-message d-flex justify-content-evenly"></div>
+								</label>
+								<textarea
+									class="form-control"
+									id="archivingCommentary"
+									name="archivingCommentary"
+									data-archiving-commentary-target="archivingCommentary"
+									data-action="keyup->archiving-commentary#archivingCommentary"></textarea>
+							</div>
 						</div>
-					</div>
-					<div
-						class="d-grid gap-2 d-md-flex justify-content-md-center mt-2">
-						<button
-							type="submit"
-							class="btn btn-danger archive-EFNC"
-							data-archiving-commentary-target="archivingButton"
-							hidden
-							disabled>
-							Archiver
-						</button>
-						{% if is_granted('ROLE_MASTER_ADMIN') %}
-							<a
+						<div
+							class="d-grid gap-2 d-md-flex justify-content-md-center mt-2">
+							<button
+								type="submit"
 								class="btn btn-danger archive-EFNC"
-								href="{{path('app_close_entity', {entityType: 'efnc', id: EFNC.id})}}">
-								Cloturer
-							</a>
-						{% endif %}
+								data-archiving-commentary-target="archivingButton"
+								hidden
+								disabled>
+								Archiver
+							</button>
+							{% if is_granted('ROLE_MASTER_ADMIN') %}
+								<a
+									class="btn btn-danger archive-EFNC"
+									href="{{path('app_close_entity', {entityType: 'efnc', id: EFNC.id})}}">
+									Cloturer
+								</a>
+							{% endif %}
+						</div>
 					</div>
+				</form>
+			{% elseif EFNC.archived is same as(true) and EFNC.status is null %}
+				<div
+					class="d-grid gap-2 d-md-flex justify-content-md-center mt-2 mb-2 text-white">
+					Archivage effectué par
+
+					{{ EFNC.LastModifier|capitalize|split('.')|first }}
+					{{ EFNC.LastModifier|upper|split('.')|last }}
+
+					avec le commentaire suivant :
+					{{ EFNC.archivingCommentary }}
 				</div>
-			</form>
+			{% elseif EFNC.archived is same as(true) and EFNC.status is not null %}
+				<div
+					class="d-grid gap-2 d-md-flex justify-content-md-center mt-2 mb-2 text-white">
+					Cloture effectué par
+
+					{{ EFNC.LastModifier|capitalize|split('.')|first }}
+					{{ EFNC.LastModifier|upper|split('.')|last }}
+				</div>
+			{% endif %}
+
 		</div>
 	</div>
 {% endblock %}