diff --git a/index.php b/index.php
index 22e6d3f..5056dc8 100644
--- a/index.php
+++ b/index.php
@@ -10,7 +10,7 @@ if (isset($_GET["customerId"])) {
   $sql = "SELECT o.* FROM Orders o INNER JOIN Customers c ON o.CustomerID = c.CustomerID WHERE c.CustomerID = " . $customer_id . ";";
 }
 else if (isset($_GET["orderId"])) {
-  $sql = "SELECT p.*, od.quantity AS order_quantity FROM Orders o INNER JOIN OrderDetails od ON o.OrderID = od.OrderID INNER JOIN Products p ON od.ProductID = p.ProductID WHERE o.OrderID =" . $order_id . ";";
+  $sql = "SELECT p.*, od.quantity, c.CustomerID AS order_quantity FROM Orders o INNER JOIN OrderDetails od ON o.OrderID = od.OrderID INNER JOIN Products p ON od.ProductID = p.ProductID INNER JOIN Customers c ON o.CustomerID = c.CustomerID WHERE o.OrderID =" . $order_id . ";";
 }
 else {
   $sql = "SELECT DISTINCT CustomerID, CustomerName FROM Customers;";
@@ -38,9 +38,24 @@ $result = mysqli_query($conn, $sql);
                 echo "<a href='index.php'>Torna alla lista clienti</a><br><br>";
                 echo "<form method='GET' action='index.php'>";
                 echo "<select id='orderId' name='orderId'>";
-                while($row = mysqli_fetch_assoc($result)) {
-                    echo "<option value='" . $row['OrderID'] . "'>" . $row['OrderID'] . "</option>";
+                $row = mysqli_fetch_assoc($result);
+                $customer_id = $row['CustomerID'];
+                mysqli_data_seek($result, 0);
+
+                if(isset($_GET["orderId"])){
+                    $sqlOrdiniCliente = "SELECT o.* FROM Orders o INNER JOIN Customers c ON o.CustomerID = c.CustomerID WHERE c.CustomerID = " . $customer_id . ";";
+                    $resultOrdiniCliente = mysqli_query($conn, $sqlOrdiniCliente);
+
+                    while($row = mysqli_fetch_assoc($resultOrdiniCliente)) {
+                        echo "<option value='" . $row['OrderID'] . "'>" . $row['OrderID'] . "</option>";
+                    }
                 }
+                else{
+                    while($row = mysqli_fetch_assoc($result)) {
+                        echo "<option value='" . $row['OrderID'] . "'>" . $row['OrderID'] . "</option>";
+                    }
+                }
+
                 echo "</select>";
                 echo "<input type='submit' value='Visualizza Dettagli Ordine'>";
                 echo "</form><br>";