diff --git a/.gitignore b/.gitignore
index 4679fd800cabfa57a39586cc4f248b5de51b81f7..06a071b4e5ab04dbfdfd34353b902db74c0167ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 ChatService/node_modules/*
 ChatService/package-lock.json
+.vscode
+.project
+.classpath
+org.eclipse.buildship.core.prefs
diff --git a/PrOjek/identity/src/main/java/com/jauharteam/ojek/identity/LoginServlet.java b/PrOjek/identity/src/main/java/com/jauharteam/ojek/identity/LoginServlet.java
index 2ded814fa29a192a4587af0a8d96a4a296611a3f..2d20e3475e01aadd615aaf5e09ddcf9876ccda17 100644
--- a/PrOjek/identity/src/main/java/com/jauharteam/ojek/identity/LoginServlet.java
+++ b/PrOjek/identity/src/main/java/com/jauharteam/ojek/identity/LoginServlet.java
@@ -18,7 +18,7 @@ public class LoginServlet extends IdentityServlet {
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        req.getRequestDispatcher("/login.jsp").forward(req, resp);
+        req.getRequestDispatcher("/webapp/login.jsp").forward(req, resp);
     }
 
     @Override
@@ -27,8 +27,14 @@ public class LoginServlet extends IdentityServlet {
         String password = req.getParameter("password");
 
         //===================================================//
-        String userAgent = req.getParameter("User-Agent").replace(';',':');
-        String ipAddress = req.getParameter("Ip-Address").replace(';',':');
+        String userAgent = req.getParameter("User-Agent");
+        if (userAgent != null) {
+            userAgent.replace(';', ':');
+        }
+        String ipAddress = req.getParameter("Ip-Address");
+        if (ipAddress != null) {
+            ipAddress.replace(';', ':');
+        }
 
         System.out.println("Log - identity-user " + userAgent);
         System.out.println("Log - identity-ip " + ipAddress);
@@ -39,7 +45,7 @@ public class LoginServlet extends IdentityServlet {
         String token = "";
         String refreshToken = "";
         Date tokenExpired = null;
-        
+
         Config config = (Config) servletContext.getAttribute("identityConfig");
         Integer tokenAge = config != null ? config.getTokenAge() : 3600000;
         if (tokenAge == null)
@@ -53,8 +59,8 @@ public class LoginServlet extends IdentityServlet {
                 // refreshToken = StringUtil.randomToken(32);
 
                 //=============================================================//
-                token = StringUtil.randomToken(10)+"#"+userAgent+"#"+ipAddress;
-                refreshToken = StringUtil.randomToken(10)+"#"+userAgent+"#"+ipAddress;
+                token = StringUtil.randomToken(10) + "#" + userAgent + "#" + ipAddress;
+                refreshToken = StringUtil.randomToken(10) + "#" + userAgent + "#" + ipAddress;
                 //=============================================================//
 
                 tokenExpired = new Date(new Date().getTime() + tokenAge);
@@ -72,7 +78,7 @@ public class LoginServlet extends IdentityServlet {
             errorMessage = "Invalid username or password";
         }
 
-        Map<String,Object> response = new HashMap<>();
+        Map<String, Object> response = new HashMap<>();
         if (success) {
             response.put("success", new Boolean(true));
             response.put("status", "success");
diff --git a/PrOjek/ojek/src/main/resources/config.json.example b/PrOjek/ojek/src/main/resources/config.json.example
index 34e388b32d1d7cb6569b2aa9003c9240284f829c..816afb503bb12d1dce3ae866aaf53db63ad0f61b 100644
--- a/PrOjek/ojek/src/main/resources/config.json.example
+++ b/PrOjek/ojek/src/main/resources/config.json.example
@@ -4,6 +4,6 @@
     "url": "",
     "username": "",
     "password": ""
-  }
+  },
   "defaultProfPicUrl": ""
 }
\ No newline at end of file