diff --git a/ChatService/src/java/org/ChatService/TokenSaver.java b/ChatService/src/java/org/ChatService/TokenSaver.java
index a5e0eca1b5c8eb4964bebfc973d98bb80f9d01d4..0b7682185ec68fe0aaf7a0335aa2837f4cc093bb 100644
--- a/ChatService/src/java/org/ChatService/TokenSaver.java
+++ b/ChatService/src/java/org/ChatService/TokenSaver.java
@@ -57,7 +57,7 @@ public class TokenSaver extends HttpServlet {
             else{
                 try (PrintWriter out = response.getWriter()) {
                     /* TODO output your page here. You may use following sample code. */
-                       out.println("<!DOCTYPE html>");
+                    out.println("<!DOCTYPE html>");
                     out.println("<html>");
                     out.println("<head>");
                     out.println("<title>Servlet login</title>");            
diff --git a/KAA-JSP/build/web/login.jsp b/KAA-JSP/build/web/login.jsp
index c79dbf0a80ca679554ebc4e5c23cd652a6dce5b5..09c0f813e1f1a7a977c64c1a9a2d605c19a72b2b 100644
--- a/KAA-JSP/build/web/login.jsp
+++ b/KAA-JSP/build/web/login.jsp
@@ -18,7 +18,7 @@
                 String user = request.getParameter("username");
                 String pass = request.getParameter("password");
                 String urlParameter = "username=" + user + "&password=" + pass;
-                //String userAgent = request.getHeader("user-agent");
+                String userAgent = request.getHeader("user-agent");
                 String urlRequest = "http://localhost:8080/IdentService/login?";
                 RestAPI_consumer consumer = new RestAPI_consumer(urlRequest, urlParameter);
                 consumer.execute();
@@ -28,6 +28,9 @@
                 String chattoken = (String) request.getParameter("chattoken");
                 Long uid = (Long) responseJSON.get("user_id");
                 String urlParameter2 = "chattoken=" + chattoken + "&user_id=" + uid;
+                String urlRequest2 = "http://localhost:8080/ChatService/TokenSaver?";
+                RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParameter2);
+                consumer2.execute();
                 
                 /* Checking the response */
                 String status = (String) responseJSON.get("status");
diff --git a/KAA-JSP/web/login.jsp b/KAA-JSP/web/login.jsp
index c79dbf0a80ca679554ebc4e5c23cd652a6dce5b5..09c0f813e1f1a7a977c64c1a9a2d605c19a72b2b 100644
--- a/KAA-JSP/web/login.jsp
+++ b/KAA-JSP/web/login.jsp
@@ -18,7 +18,7 @@
                 String user = request.getParameter("username");
                 String pass = request.getParameter("password");
                 String urlParameter = "username=" + user + "&password=" + pass;
-                //String userAgent = request.getHeader("user-agent");
+                String userAgent = request.getHeader("user-agent");
                 String urlRequest = "http://localhost:8080/IdentService/login?";
                 RestAPI_consumer consumer = new RestAPI_consumer(urlRequest, urlParameter);
                 consumer.execute();
@@ -28,6 +28,9 @@
                 String chattoken = (String) request.getParameter("chattoken");
                 Long uid = (Long) responseJSON.get("user_id");
                 String urlParameter2 = "chattoken=" + chattoken + "&user_id=" + uid;
+                String urlRequest2 = "http://localhost:8080/ChatService/TokenSaver?";
+                RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParameter2);
+                consumer2.execute();
                 
                 /* Checking the response */
                 String status = (String) responseJSON.get("status");