diff --git a/app/models/account.rb b/app/models/account.rb
index 65c85e0a3..bcb1332b6 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -3,6 +3,7 @@ class Account < ApplicationRecord
 
   has_one :join_code
   has_many :users, dependent: :destroy
+  has_many :boards, dependent: :destroy
 
   has_many_attached :uploads
 
diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb
index a7826b0b4..e6a9fbf2b 100644
--- a/app/models/user/accessor.rb
+++ b/app/models/user/accessor.rb
@@ -12,6 +12,6 @@ module User::Accessor
 
   private
     def grant_access_to_boards
-      Access.insert_all Board.all_access.pluck(:id).collect { |board_id| { board_id: board_id, user_id: id } }
+      Access.insert_all account.boards.all_access.pluck(:id).collect { |board_id| { board_id: board_id, user_id: id } }
     end
 end
diff --git a/test/fixtures/boards.yml b/test/fixtures/boards.yml
index 99b10231a..6ed4fcfec 100644
--- a/test/fixtures/boards.yml
+++ b/test/fixtures/boards.yml
@@ -9,3 +9,9 @@ private:
   creator: kevin
   all_access: false
   account: 37s
+
+staplers:
+  name: Staplers
+  creator: mike
+  all_access: true
+  account: initech
diff --git a/test/models/user/accessor_test.rb b/test/models/user/accessor_test.rb
index f83935883..6c1d6c927 100644
--- a/test/models/user/accessor_test.rb
+++ b/test/models/user/accessor_test.rb
@@ -5,7 +5,7 @@ class User::AccessorTest < ActiveSupport::TestCase
     user = User.create!(name: "Jorge")
 
     assert_includes user.boards, boards(:writebook)
-    assert_equal Board.all_access.count, user.boards.count
+    assert_equal user.account.boards.all_access.count, user.boards.count
   end
 
   test "system user does not get added to boards on creation" do