diff --git a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java
index 4c8e2bd0984b99a3dcdc151f2a338ae56e210220..85589a985bc78c0fe262489b0446d434efc8ef1c 100644
--- a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java
+++ b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java
@@ -35,8 +35,16 @@ public class LoginServlet extends WebappServlet {
         String password = req.getParameter("password");
 
         //===================================================//
+        String remoteAddr = "";
+        if (req!= null) {
+            remoteAddr = req.getHeader("X-FORWARDED-FOR");
+            if (remoteAddr == null || "".equals(remoteAddr)) {
+                remoteAddr = req.getRemoteAddr();
+            }
+        }
+
         String userAgent = req.getHeader("User-Agent");
-        String ipAddress = req.getRemoteAddr();
+        String ipAddress = remoteAddr;
 
         System.out.println("webapp-user " + userAgent);
         System.out.println("webapp-ip " + ipAddress);
diff --git a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java
index c83226d37b2a142833d7b0256e60f54b507c49a3..dc7474669d3c0e6b49a5e96caa76b80c65b09a44 100644
--- a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java
+++ b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java
@@ -34,8 +34,16 @@ public class RegisterServlet extends WebappServlet {
         String driverStr = req.getParameter("driver");
 
         //===================================================//
+        String remoteAddr = "";
+        if (req!= null) {
+            remoteAddr = req.getHeader("X-FORWARDED-FOR");
+            if (remoteAddr == null || "".equals(remoteAddr)) {
+                remoteAddr = req.getRemoteAddr();
+            }
+        }
+
         String userAgent = req.getHeader("User-Agent");
-        String ipAddress = req.getRemoteAddr();
+        String ipAddress = remoteAddr;
 
         System.out.println("webapp-user " + userAgent);
         System.out.println("webapp-ip " + ipAddress);