diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index 8387bc08c..38f09aa04 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -53,6 +53,11 @@ class Registrar < ActiveRecord::Base
     whois_records.map(&:save) # slow currently
   end
 
+  after_create :create_cash_account
+  def create_cash_account
+    accounts.create(account_type: Account::CASH, currency: 'EUR')
+  end
+
   class << self
     def search_by_query(query)
       res = search(name_or_reg_no_cont: query).result
diff --git a/db/seeds.rb b/db/seeds.rb
index 6681af5bf..be8f60f2a 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -63,6 +63,10 @@ if @api_user2.blank?
   )
 end
 
+Registrar.all.each do |x|
+  x.accounts.where(account_type: Account::CASH, currency: 'EUR').first_or_create!
+end
+
 admin1 = {
   username: 'user1',
   password: 'testtest',
diff --git a/spec/fabricators/registrar_fabricator.rb b/spec/fabricators/registrar_fabricator.rb
index 09ee644e9..32c922eb5 100644
--- a/spec/fabricators/registrar_fabricator.rb
+++ b/spec/fabricators/registrar_fabricator.rb
@@ -9,7 +9,6 @@ Fabricator(:registrar) do
   country_code 'EE'
   code { sequence(:code) { |i| "REGISTRAR#{i}" } }
   reference_no { sequence(:reference_no) { |i| "RF#{i}" } }
-  accounts(count: 1)
   white_ips { [Fabricate(:white_ip)] }
 end
 
diff --git a/spec/models/registrar_spec.rb b/spec/models/registrar_spec.rb
index e8d719e92..c169a5b73 100644
--- a/spec/models/registrar_spec.rb
+++ b/spec/models/registrar_spec.rb
@@ -62,6 +62,10 @@ describe Registrar do
       @registrar.errors.full_messages.should match_array([])
     end
 
+    it 'should have a cash account' do
+      @registrar.cash_account.should_not be_nil
+    end
+
     it 'should validates uniqueness of code' do
       registrar = Fabricate.build(:registrar, code: @registrar.code)
       registrar.valid?
diff --git a/spec/requests/v1/account_spec.rb b/spec/requests/v1/account_spec.rb
index 1251583db..5a8fd6b0d 100644
--- a/spec/requests/v1/account_spec.rb
+++ b/spec/requests/v1/account_spec.rb
@@ -16,9 +16,9 @@ describe Repp::AccountV1 do
 
   context 'with valid registrar' do
     before :all do
-      @registrar1 = Fabricate(:registrar1, accounts:
-        [Fabricate(:account, { balance: '324.45', account_activities: [] })]
-      )
+      @registrar1 = Fabricate(:registrar1)
+      @registrar1.accounts = [Fabricate(:account, { balance: '324.45', account_activities: [] })]
+      @registrar1.save
       @api_user = Fabricate(:gitlab_api_user, registrar: @registrar1)
     end