diff --git a/ClientApplication/src/main/java/com/champix/clientchampix/controller/AuthentificationController.java b/ClientApplication/src/main/java/com/champix/clientchampix/controller/AuthentificationController.java
index 5adc491..aff4b71 100644
--- a/ClientApplication/src/main/java/com/champix/clientchampix/controller/AuthentificationController.java
+++ b/ClientApplication/src/main/java/com/champix/clientchampix/controller/AuthentificationController.java
@@ -69,6 +69,7 @@ public ModelAndView logout(HttpServletRequest request, HttpServletResponse respo
         {
             HttpSession session = request.getSession();
             session.removeAttribute("id");
+            session.removeAttribute("jwt");
             destinationPage = "/index";
         }
         return new ModelAndView(destinationPage);
diff --git a/ClientApplication/src/main/java/com/champix/clientchampix/controller/ReservationController.java b/ClientApplication/src/main/java/com/champix/clientchampix/controller/ReservationController.java
index 8df3fe8..91a5026 100644
--- a/ClientApplication/src/main/java/com/champix/clientchampix/controller/ReservationController.java
+++ b/ClientApplication/src/main/java/com/champix/clientchampix/controller/ReservationController.java
@@ -91,17 +91,6 @@ public ModelAndView envoiReservation(HttpServletRequest request,
         }
         return new ModelAndView(destinationPage);
     }
-    
-    private boolean checkJWTSession(HttpServletRequest request) {
-        HttpSession session = request.getSession();
-        if (!JWTManager.verify((String) session.getAttribute("jwt"))) {
-            session.setAttribute("id", null);
-            session.setAttribute("jwt", null);
-            request.setAttribute("error", "Session expired");
-            return false;
-        }
-        return true;
-    }
 
     @RequestMapping(method = RequestMethod.GET, value = "/reservations")
     public ModelAndView getAllReservationUser(HttpServletRequest request,
@@ -123,4 +112,15 @@ public ModelAndView getAllReservationUser(HttpServletRequest request,
         }
         return new ModelAndView(destinationPage);
     }
+    
+    private boolean checkJWTSession(HttpServletRequest request) {
+        HttpSession session = request.getSession();
+        if (session.getAttribute("id") == null || !JWTManager.verify((String) session.getAttribute("jwt"))) {
+            session.removeAttribute("id");
+            session.removeAttribute("jwt");
+            request.setAttribute("error", "Session expired");
+            return false;
+        }
+        return true;
+    }
 }