diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp
index 796b59b5ab76dbb11cce5fc4db32a33fe8ce9321..6e41e0344d2d08335c1d104f6ad7d3d6ad89df0b 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp
@@ -28,5 +28,6 @@
 <%@include file="/component/footer.html" %>
 
 <script>
+    src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"
     window.onload = toggleActive("nav-order");
 </script>
\ No newline at end of file
diff --git a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
index 0de1e08bc3d3bb126bdda7097de50248eb2a7dd6..9d7215b839f107615d0cb424e52c1d92f0f461bb 100644
--- a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
+++ b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
@@ -104,12 +104,14 @@ public class OrderHandler {
         webServiceBean.setStatus(WebServiceBean.STATUS_INVALID);
       } else {
         webServiceBean.setStatus(WebServiceBean.STATUS_VALID);
+        UserModel userModel = new UserModel();
+        UserBean wsUser = userModel.findUserByUsername(validUser.getUsername());
         OrderBean orderBean = gson.fromJson(order, OrderBean.class);
         DriverModel driverModel = new DriverModel();
         driverModel.queryUpdate(String.format(
             "INSERT INTO orders (user_id,driver_id,pickup,destination,rating,comment) VALUES"
                 + "(%d,%d,'%s','%s','%d','%s')",
-            validUser.getId(),orderBean.getDriverId(),orderBean.getPickup(),orderBean.getDestination(),
+            wsUser.getId(),orderBean.getDriverId(),orderBean.getPickup(),orderBean.getDestination(),
             orderBean.getRating().intValue(), orderBean.getComment()
         ));
       }