diff --git a/app/views/registrar/invoices/index.haml b/app/views/registrar/invoices/index.haml
index d0c38940b..e20158ea7 100644
--- a/app/views/registrar/invoices/index.haml
+++ b/app/views/registrar/invoices/index.haml
@@ -23,12 +23,12 @@
             = f.search_field :number_lteq, class: 'form-control', placeholder: t(:maximum_invoice_no), autocomplete: 'off'
         .col-md-3
           .form-group
-            = f.label t(:due_date_after)
-            = f.search_field :due_date_gt, value: params[:q][:due_date_gt], class: 'form-control datepicker', placeholder: t(:due_date_after), autocomplete: 'off'
+            = f.label t(:due_date_from)
+            = f.search_field :due_date_gteq, value: params[:q][:due_date_gteq], class: 'form-control datepicker', placeholder: t(:due_date_from), autocomplete: 'off'
         .col-md-3
           .form-group
-            = f.label t(:due_date_before)
-            = f.search_field :due_date_lt, value: params[:q][:due_date_lt], class: 'form-control datepicker', placeholder: t(:due_date_before), autocomplete: 'off'
+            = f.label t(:due_date_until)
+            = f.search_field :due_date_lteq, value: params[:q][:due_date_lteq], class: 'form-control datepicker', placeholder: t(:due_date_until), autocomplete: 'off'
       .row
         .col-md-3
           .form-group
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ede57ad79..56d5bceba 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -753,8 +753,8 @@ en:
   cannot_bind_cancelled_invoice: 'Cannot bind cancelled invoice'
   minimum_invoice_no: 'Miminum invoice no'
   maximum_invoice_no: 'Maximum invoice no'
-  due_date_after: 'Due date after'
-  due_date_before: 'Due date before'
+  due_date_from: 'Due date from'
+  due_date_until: 'Due date until'
   minimum_total: 'Minimum total'
   maximum_total: 'Maximum total'
   hostname_end: 'Hostname end'