diff --git a/lib/data/models/credit_model.dart b/lib/data/models/credit_model.dart
index dfb05c6e8..26c0a777f 100644
--- a/lib/data/models/credit_model.dart
+++ b/lib/data/models/credit_model.dart
@@ -51,6 +51,7 @@ class CreditFields {
   static const String discount = 'discount';
   static const String poNumber = 'po_number';
   static const String date = 'date';
+  static const String validUntil = 'valid_until';
   static const String terms = 'terms';
   static const String footer = 'footer';
   static const String partial = 'partial';
diff --git a/lib/ui/credit/credit_presenter.dart b/lib/ui/credit/credit_presenter.dart
index 9bf0c74d4..3ad3f3f1b 100644
--- a/lib/ui/credit/credit_presenter.dart
+++ b/lib/ui/credit/credit_presenter.dart
@@ -25,6 +25,7 @@ class CreditPresenter extends EntityPresenter {
       ...getDefaultTableFields(userCompany),
       ...EntityPresenter.getBaseFields(),
       CreditFields.discount,
+      CreditFields.validUntil,
       CreditFields.poNumber,
       CreditFields.publicNotes,
       CreditFields.privateNotes,
@@ -58,6 +59,8 @@ class CreditPresenter extends EntityPresenter {
             .listDisplayName);
       case CreditFields.date:
         return Text(formatDate(credit.date, context));
+      case CreditFields.validUntil:
+        return Text(formatDate(credit.dueDate, context));
       case CreditFields.amount:
         return Align(
           alignment: Alignment.centerRight,
diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart
index 7af0c285a..e914641b2 100644
--- a/lib/ui/invoice/edit/invoice_edit_desktop.dart
+++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart
@@ -350,12 +350,11 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                             .onChanged(invoice.rebuild((b) => b..date = date));
                       },
                     ),
-                    if (entityType != EntityType.credit)
                       DatePicker(
                         key: ValueKey('__terms_${client.id}__'),
-                        labelText: entityType == EntityType.quote
-                            ? localization.validUntil
-                            : localization.dueDate,
+                        labelText: entityType == EntityType.invoice
+                            ? localization.dueDate
+                            : localization.validUntil,
                         selectedDate: invoice.dueDate,
                         message: termsString,
                         onSelected: (date) {
diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart
index af3189bf9..9d5c08aef 100644
--- a/lib/ui/invoice/edit/invoice_edit_details.dart
+++ b/lib/ui/invoice/edit/invoice_edit_details.dart
@@ -248,11 +248,10 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
                   viewModel.onChanged(invoice.rebuild((b) => b..date = date));
                 },
               ),
-              if (widget.entityType != EntityType.credit)
                 DatePicker(
-                  labelText: widget.entityType == EntityType.quote
-                      ? localization.validUntil
-                      : localization.dueDate,
+                  labelText: widget.entityType == EntityType.invoice
+                      ? localization.dueDate
+                      : localization.validUntil,
                   selectedDate: invoice.dueDate,
                   onSelected: (date) {
                     viewModel
diff --git a/lib/ui/reports/credit_report.dart b/lib/ui/reports/credit_report.dart
index a55091a11..96bc29b88 100644
--- a/lib/ui/reports/credit_report.dart
+++ b/lib/ui/reports/credit_report.dart
@@ -26,7 +26,7 @@ enum CreditReportFields {
   discount,
   po_number,
   date,
-  due_date,
+  valid_until,
   partial,
   partial_due_date,
   auto_bill,
@@ -79,7 +79,7 @@ ReportResult creditReport(
     CreditReportFields.amount,
     CreditReportFields.balance,
     CreditReportFields.date,
-    CreditReportFields.due_date,
+    CreditReportFields.valid_until,
     CreditReportFields.client
   ];
 
@@ -151,7 +151,7 @@ ReportResult creditReport(
         case CreditReportFields.date:
           value = credit.date;
           break;
-        case CreditReportFields.due_date:
+        case CreditReportFields.valid_until:
           value = credit.dueDate;
           break;
         case CreditReportFields.partial: