diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php
index 428e48144d..d19ba94d52 100644
--- a/app/Repositories/Account/AccountRepositoryInterface.php
+++ b/app/Repositories/Account/AccountRepositoryInterface.php
@@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Account;
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -26,6 +27,11 @@ use Illuminate\Support\Collection;
 interface AccountRepositoryInterface
 {
 
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * Moved here from account CRUD.
      *
diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php
index 57fbebaa79..81ef432b9e 100644
--- a/app/Repositories/Account/AccountTaskerInterface.php
+++ b/app/Repositories/Account/AccountTaskerInterface.php
@@ -14,6 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Repositories\Account;
 
 use Carbon\Carbon;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -23,6 +24,10 @@ use Illuminate\Support\Collection;
  */
 interface AccountTaskerInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
 
     /**
      * @param Collection $accounts
diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php
index 9e12092c70..25dc72ff38 100644
--- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php
+++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\Attachment;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Attachment;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -25,6 +26,11 @@ use Illuminate\Support\Collection;
 interface AttachmentRepositoryInterface
 {
 
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * @param Attachment $attachment
      *
diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php
index c2c6cd223d..af6dd36dab 100644
--- a/app/Repositories/Bill/BillRepositoryInterface.php
+++ b/app/Repositories/Bill/BillRepositoryInterface.php
@@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Bill;
 use Carbon\Carbon;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -25,6 +26,10 @@ use Illuminate\Support\Collection;
  */
 interface BillRepositoryInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
 
     /**
      * @param Bill $bill
diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php
index ee9eba1641..3eefa19b01 100644
--- a/app/Repositories/Budget/BudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/BudgetRepositoryInterface.php
@@ -17,6 +17,7 @@ use Carbon\Carbon;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -26,6 +27,10 @@ use Illuminate\Support\Collection;
  */
 interface BudgetRepositoryInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
 
     /**
      * @return bool
diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php
index 1194fbbf74..80b42d6852 100644
--- a/app/Repositories/Category/CategoryRepositoryInterface.php
+++ b/app/Repositories/Category/CategoryRepositoryInterface.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\Category;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Category;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -24,6 +25,11 @@ use Illuminate\Support\Collection;
  */
 interface CategoryRepositoryInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * @param Category $category
      *
diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php
index 4ccebe40b0..9c63c1fbfc 100644
--- a/app/Repositories/Currency/CurrencyRepositoryInterface.php
+++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php
@@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Currency;
 
 use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -25,6 +26,11 @@ use Illuminate\Support\Collection;
  */
 interface CurrencyRepositoryInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * @param TransactionCurrency $currency
      *
diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php
index 6f3c7a30b1..484e8496b5 100644
--- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php
+++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php
@@ -14,6 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Repositories\ExportJob;
 
 use FireflyIII\Models\ExportJob;
+use FireflyIII\User;
 
 /**
  * Interface ExportJobRepositoryInterface
@@ -22,6 +23,11 @@ use FireflyIII\Models\ExportJob;
  */
 interface ExportJobRepositoryInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * @param ExportJob $job
      * @param string    $status
diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php
index a17d9ca62c..b58468f1af 100644
--- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php
+++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php
@@ -14,6 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Repositories\ImportJob;
 
 use FireflyIII\Models\ImportJob;
+use FireflyIII\User;
 
 /**
  * Interface ImportJobRepositoryInterface
@@ -22,6 +23,11 @@ use FireflyIII\Models\ImportJob;
  */
 interface ImportJobRepositoryInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * @param string $fileType
      *
diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php
index 0b62a5729a..446d21c184 100644
--- a/app/Repositories/Journal/JournalRepositoryInterface.php
+++ b/app/Repositories/Journal/JournalRepositoryInterface.php
@@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Journal;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 
@@ -26,7 +27,10 @@ use Illuminate\Support\MessageBag;
  */
 interface JournalRepositoryInterface
 {
-
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
     /**
      * @param TransactionJournal $journal
      * @param TransactionType    $type
diff --git a/app/Repositories/Journal/JournalTaskerInterface.php b/app/Repositories/Journal/JournalTaskerInterface.php
index 058bc63733..e5c007c1e7 100644
--- a/app/Repositories/Journal/JournalTaskerInterface.php
+++ b/app/Repositories/Journal/JournalTaskerInterface.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\Journal;
 
 
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -24,6 +25,10 @@ use Illuminate\Support\Collection;
  */
 interface JournalTaskerInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
 
     /**
      * @param TransactionJournal $journal
diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
index aae01702d7..a2da326d86 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\PiggyBank;
 
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -98,6 +99,10 @@ interface PiggyBankRepositoryInterface
      */
     public function setOrder(int $piggyBankId, int $order): bool;
 
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
 
     /**
      * Store new piggy bank.
diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php
index 518417d94a..887bb20d79 100644
--- a/app/Repositories/Rule/RuleRepositoryInterface.php
+++ b/app/Repositories/Rule/RuleRepositoryInterface.php
@@ -17,6 +17,7 @@ use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\RuleTrigger;
+use FireflyIII\User;
 
 /**
  * Interface RuleRepositoryInterface
@@ -25,7 +26,10 @@ use FireflyIII\Models\RuleTrigger;
  */
 interface RuleRepositoryInterface
 {
-
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
     /**
      * @return int
      */
diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
index 985a121b92..c365fca704 100644
--- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
@@ -26,7 +26,6 @@ use Illuminate\Support\Collection;
 interface RuleGroupRepositoryInterface
 {
 
-
     /**
      *
      *
@@ -92,6 +91,11 @@ interface RuleGroupRepositoryInterface
      */
     public function resetRulesInGroupOrder(RuleGroup $ruleGroup): bool;
 
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * @param array $data
      *
diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php
index 64bf47c44e..c813a238da 100644
--- a/app/Repositories/Tag/TagRepositoryInterface.php
+++ b/app/Repositories/Tag/TagRepositoryInterface.php
@@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Tag;
 use Carbon\Carbon;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 
@@ -26,6 +27,11 @@ use Illuminate\Support\Collection;
  */
 interface TagRepositoryInterface
 {
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * This method will connect a journal with a tag.
      *
diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php
index 93e34a7a14..9e2bb096b3 100644
--- a/app/Repositories/User/UserRepositoryInterface.php
+++ b/app/Repositories/User/UserRepositoryInterface.php
@@ -24,6 +24,7 @@ use Illuminate\Support\Collection;
  */
 interface UserRepositoryInterface
 {
+
     /**
      * Returns a collection of all users.
      *