diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java b/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java
index 8cc2c4b..6c34b29 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java
@@ -5,8 +5,8 @@ public final class Global {
   public static final String PERSISTENCE_UNIT_NAME = "prod";
   public static final String PERSISTENCE_UNIT_NAME_TEST = "test";
   public static final String TOMCAT_PORT = "8088";
-  public static final String MAIL_USERNAME = "cardrushuppa@gmail.com";
-  public static final String MAIL_PASSWORD = "evkz lowg dqfs ncrz";
+  public static final String MAIL_USERNAME = "cardsrushuppa@gmail.com";
+  public static final String MAIL_PASSWORD = "aktr zity mayw kvek";
   public static final String MAIL_PORT = "587";
   public static final String MAIL_HOST = "smtp.gmail.com";
 
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
index 1f7310b..5fc30ac 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
@@ -36,7 +36,6 @@ public class ForgottenPasswordServlet extends HttpServlet {
   }
 
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-
     request.getRequestDispatcher("/WEB-INF/views/forgotten-password.jsp").forward(request, response);
   }
 
@@ -54,14 +53,11 @@ public class ForgottenPasswordServlet extends HttpServlet {
       response.sendRedirect(request.getContextPath() + "/forgotten-password?error=1");
     } else {
       String token = UUID.randomUUID().toString();
-
       RecoveryPasswordToken recoveryPasswordToken = new RecoveryPasswordToken(token, user);
       CreateToken(recoveryPasswordToken);
-
       sendRecoveryEmail(email, token, request);
       response.sendRedirect(request.getContextPath() + "/forgotten-password?success=200");
     }
-
   }
 
   /**
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
index 179c896..660fb13 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
@@ -18,17 +18,16 @@ public class ResetPasswordServlet extends HttpServlet {
     }
 
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-
-    RecoveryPasswordToken token = findRecoveryToken(request.getParameter("token"));
-    if (token == null) {
-      response.sendRedirect(request.getContextPath() + "/forgotten-password?error=invalid-token");
-      return;
-    }
-    if (token.getExpirationDate().compareTo(new java.util.Date()) < 0){
-      response.sendRedirect(request.getContextPath() + "/forgotten-password?error=expired-token");
-      return;
-    }
-    request.getRequestDispatcher("/WEB-INF/views/reset-password.jsp").forward(request, response);
+      RecoveryPasswordToken token = findRecoveryToken(request.getParameter("token"));
+      if (token == null) {
+        response.sendRedirect(request.getContextPath() + "/forgotten-password?error=invalid-token");
+        return;
+      }
+      if (token.getExpirationDate().compareTo(new java.util.Date()) < 0){
+        response.sendRedirect(request.getContextPath() + "/forgotten-password?error=expired-token");
+        return;
+      }
+      request.getRequestDispatcher("/WEB-INF/views/reset-password.jsp").forward(request, response);
     }
 
     /**