diff --git a/app/controllers/eis_billing/e_invoice_response_controller.rb b/app/controllers/eis_billing/e_invoice_response_controller.rb
index 8d50001ce..30592aab3 100644
--- a/app/controllers/eis_billing/e_invoice_response_controller.rb
+++ b/app/controllers/eis_billing/e_invoice_response_controller.rb
@@ -1,4 +1,4 @@
-class EisBilling::EInvoiceResponseController < ApplicationController
+class EisBilling::EInvoiceResponseController < EisBilling::BaseController
   def update
     invoice_number = params[:invoice_number]
     date = params[:date]
diff --git a/app/services/eis_billing/send_e_invoice.rb b/app/services/eis_billing/send_e_invoice.rb
index d5bfbb2e8..beeb1ac20 100644
--- a/app/services/eis_billing/send_e_invoice.rb
+++ b/app/services/eis_billing/send_e_invoice.rb
@@ -12,8 +12,8 @@ module EisBilling
         invoice_subtotal: invoice.subtotal,
         buyer_billing_email: invoice.buyer.billing_email,
         buyer_e_invoice_iban: invoice.buyer.e_invoice_iban,
-        seller_country: invoice.seller_country,
-        buyer_country: invoice.buyer_country,
+        seller_country_code: invoice.seller_country_code,
+        buyer_country_code: invoice.buyer_country_code,
         payable: payable,
         initiator: INITIATOR
       }