diff --git a/backend/src/main/java/com/printcalculator/service/OrderService.java b/backend/src/main/java/com/printcalculator/service/OrderService.java
index b789191..fbf7849 100644
--- a/backend/src/main/java/com/printcalculator/service/OrderService.java
+++ b/backend/src/main/java/com/printcalculator/service/OrderService.java
@@ -81,6 +81,14 @@ public class OrderService {
 
         customer.setPhone(request.getCustomer().getPhone());
         customer.setCustomerType(request.getCustomer().getCustomerType());
+        
+        if (request.getBillingAddress() != null) {
+            customer.setFirstName(request.getBillingAddress().getFirstName());
+            customer.setLastName(request.getBillingAddress().getLastName());
+            customer.setCompanyName(request.getBillingAddress().getCompanyName());
+            customer.setContactPerson(request.getBillingAddress().getContactPerson());
+        }
+        
         customer.setUpdatedAt(OffsetDateTime.now());
         customerRepo.save(customer);
 
diff --git a/frontend/src/assets/i18n/it.json b/frontend/src/assets/i18n/it.json
index 1d8e7c3..a7655a1 100644
--- a/frontend/src/assets/i18n/it.json
+++ b/frontend/src/assets/i18n/it.json
@@ -274,7 +274,7 @@
     "METHOD_TWINT": "TWINT",
     "METHOD_BANK": "Fattura QR / Bonifico",
     "STATUS_REPORTED_TITLE": "Ordine in lavorazione",
-    "STATUS_REPORTED_DESC": "Abbiamo registrato la tua operazione. L'ordine entrerà a breve in produzione.",
+    "STATUS_REPORTED_DESC": "Abbiamo registrato la tua operazione. Appena confermiamo il pagamento l'ordine entrà in produzione",
     "IN_VERIFICATION": "Pagamento Segnalato"
   },
   "TRACKING": {