diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index b75bfae47..1feb2caf4 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -64,10 +64,6 @@ class Registrar < ActiveRecord::Base
       res.reduce([]) { |o, v| o << { id: v[:id], display_key: "#{v[:name]} (#{v[:reg_no]})" } }
     end
 
-    def eis
-      find_by(reg_no: '90010019')
-    end
-
     def ordered
       order(name: :asc)
     end
diff --git a/app/views/invoice_mailer/invoice_email.html.erb b/app/views/invoice_mailer/invoice_email.html.erb
index 0a9e4163b..35f0dbb6e 100644
--- a/app/views/invoice_mailer/invoice_email.html.erb
+++ b/app/views/invoice_mailer/invoice_email.html.erb
@@ -1,5 +1,5 @@
 <%= t(:you_have_a_new_invoice) %>
 <br><br>
 <%= t(:sincerely) %>,<br>
-<%= Setting.eis_invoice_contact %><br>
+<%= Setting.registry_invoice_contact %><br>
 <%= @invoice.seller_phone %>
diff --git a/app/views/invoice_mailer/invoice_email.text.erb b/app/views/invoice_mailer/invoice_email.text.erb
index ae65fd7da..ab8595474 100644
--- a/app/views/invoice_mailer/invoice_email.text.erb
+++ b/app/views/invoice_mailer/invoice_email.text.erb
@@ -1,5 +1,5 @@
 <%= t(:you_have_a_new_invoice) %>
 
 <%= t(:sincerely) %>,
-<%= Setting.eis_invoice_contact %>
+<%= Setting.registry_invoice_contact %>
 <%= @invoice.seller_phone %>
diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb
index 29ef89c70..764a96c18 100644
--- a/config/initializers/initial_settings.rb
+++ b/config/initializers/initial_settings.rb
@@ -24,10 +24,6 @@ if con.present? && con.table_exists?('settings')
 
   Setting.save_default(:client_side_status_editing_enabled, false)
 
-  Setting.save_default(:eis_iban, 'EE557700771000598731')
-  Setting.save_default(:eis_bank, 'LHV Pank')
-  Setting.save_default(:eis_swift, 'LHVBEE22')
-  Setting.save_default(:eis_invoice_contact, 'Martti Õigus')
   Setting.save_default(:invoice_number_min, 131050)
   Setting.save_default(:invoice_number_max, 149999)
   Setting.save_default(:days_to_keep_overdue_invoices_active, 30)