diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
index 7099dd7..8a90d43 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
@@ -40,8 +40,6 @@ public class UserController {
         User user = userRepository.findById(userId).get();
         model.addAttribute("user", user);
 
-        //TODO: klären wegen Geschäftskundenunterscheidung
-
         return "user/settings";
     }
 
diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrder.java b/prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrder.java
index d9410f7..8b703b6 100644
--- a/prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrder.java
+++ b/prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrder.java
@@ -56,4 +56,9 @@ public class CustomerOrder {
     public String formatDeliveredAt(){
         return new SimpleDateFormat("dd.MM.yyyy HH:mm").format(deliveredAt);
     }
+
+    public String getEstimatedArrival() {
+        //TODO: get estimated arrival from api
+        return "TODO TODO TODO";
+    }
 }
diff --git a/prototype/src/main/resources/templates/user/orders/index.html b/prototype/src/main/resources/templates/user/orders/index.html
index b746f52..327bbf2 100644
--- a/prototype/src/main/resources/templates/user/orders/index.html
+++ b/prototype/src/main/resources/templates/user/orders/index.html
@@ -27,7 +27,7 @@
                 <table class="key-value">
                     <tr>
                         <th>Lieferstatus</th>
-                        <td  th:if="${order.deliveredAt == null}"><b>Unterwegs</b> <br/> Vorraussichtliche Ankunft: TODO TODO TODO TODO</td>
+                        <td  th:if="${order.deliveredAt == null}"><b>Unterwegs</b> <br/> Vorraussichtliche Ankunft: <span th:text="${order.getEstimatedArrival()}" /></td>
                         <td  th:if="${order.deliveredAt != null}"><b>Angekommen</b> <br/> Ankunft: <span th:text="${order.formatDeliveredAt()}" /></td>
                     </tr>
                     <tr>