diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 5783ad1..ccbf65e 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -159,7 +159,6 @@ class UserController extends AbstractController
         ]);
     }
 
-//TODO : MONOLOG
     #[Route('/edit/{id}', name: 'edit', methods: ['GET', 'POST'])]
     public function edit(int $id, Request $request): Response
     {
@@ -183,16 +182,19 @@ class UserController extends AbstractController
                 $user->setModifiedAt(new \DateTimeImmutable('now'));
                 $this->entityManager->persist($user);
                 $this->entityManager->flush();
+
+                //log and action
+                $this->logger->notice("User information edited for " . $user->getUserIdentifier());
                 if ($request->get('organizationId')) {
                     $org = $this->organizationRepository->find($request->get('organizationId'));
                     if ($org) {
                         $this->actionService->createAction("Edit user information", $actingUser, $org, $user->getUserIdentifier());
+                        return $this->redirectToRoute('user_show', ['id' => $user->getId(), 'organizationId' => $request->get('organizationId')]);
                     }
                 } else {
                     $this->actionService->createAction("Edit user information", $actingUser, null, $user->getUserIdentifier());
+                    return $this->redirectToRoute('user_show', ['id' => $user->getId()]);
                 }
-
-                return $this->redirectToRoute('user_show', ['id' => $user->getId(), 'organizationId' => $request->get('organizationId')]);
             }
 
             return $this->render('user/edit.html.twig', [