diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php
index f5e5eb7634..b40e21785f 100644
--- a/app/Http/Requests/AccountFormRequest.php
+++ b/app/Http/Requests/AccountFormRequest.php
@@ -14,7 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Requests;
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class AccountFormRequest
@@ -60,13 +60,15 @@ class AccountFormRequest extends Request
      */
     public function rules()
     {
+        /** @var AccountRepositoryInterface $repository */
+        $repository     = app(AccountRepositoryInterface::class);
         $accountRoles   = join(',', array_keys(config('firefly.accountRoles')));
         $types          = join(',', array_keys(config('firefly.subTitlesByIdentifier')));
         $ccPaymentTypes = join(',', array_keys(config('firefly.ccTypes')));
 
         $nameRule = 'required|min:1|uniqueAccountForUser';
         $idRule   = '';
-        if (Account::find($this->get('id'))) {
+        if (!is_null($repository->find(intval($this->get('id')))->id)) {
             $idRule   = 'belongsToUser:accounts';
             $nameRule = 'required|min:1|uniqueAccountForUser:' . $this->get('id');
         }
diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php
index 6228bdf35f..3ca9d0fb37 100644
--- a/app/Http/Requests/BudgetFormRequest.php
+++ b/app/Http/Requests/BudgetFormRequest.php
@@ -13,7 +13,7 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 
 /**
  * Class BudgetFormRequest
@@ -47,9 +47,10 @@ class BudgetFormRequest extends Request
      */
     public function rules()
     {
-
-        $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name';
-        if (Budget::find($this->get('id'))) {
+        /** @var BudgetRepositoryInterface $repository */
+        $repository = app(BudgetRepositoryInterface::class);
+        $nameRule   = 'required|between:1,100|uniqueObjectForUser:budgets,name';
+        if (!is_null($repository->find(intval($this->get('id')))->id)) {
             $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,' . intval($this->get('id'));
         }
 
diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php
index fb676b8d79..34347608af 100644
--- a/app/Http/Requests/CategoryFormRequest.php
+++ b/app/Http/Requests/CategoryFormRequest.php
@@ -13,7 +13,7 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 
 /**
  * Class CategoryFormRequest
@@ -47,9 +47,10 @@ class CategoryFormRequest extends Request
      */
     public function rules()
     {
-
-        $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
-        if (Category::find($this->get('id'))) {
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = app(CategoryRepositoryInterface::class);
+        $nameRule   = 'required|between:1,100|uniqueObjectForUser:categories,name';
+        if (!is_null($repository->find(intval($this->get('id')))->id)) {
             $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval($this->get('id'));
         }
 
diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php
index 5a58730c6a..814f0c560d 100644
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -13,7 +13,7 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use FireflyIII\Models\RuleGroup;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 
 /**
  * Class RuleFormRequest
@@ -57,7 +57,8 @@ class RuleFormRequest extends Request
      */
     public function rules()
     {
-
+        /** @var RuleGroupRepositoryInterface $repository */
+        $repository    = app(RuleGroupRepositoryInterface::class);
         $validTriggers = array_keys(config('firefly.rule-triggers'));
         $validActions  = array_keys(config('firefly.rule-actions'));
 
@@ -65,7 +66,7 @@ class RuleFormRequest extends Request
         $contextActions = join(',', config('firefly.rule-actions-text'));
 
         $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
-        if (RuleGroup::find($this->get('id'))) {
+        if (!is_null($repository->find(intval($this->get('id')))->id)) {
             $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id'));
         }
 
diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php
index 3a79119963..c0501c1798 100644
--- a/app/Http/Requests/TagFormRequest.php
+++ b/app/Http/Requests/TagFormRequest.php
@@ -13,7 +13,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Requests;
 
 use Carbon\Carbon;
-use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 
 /**
  * Class TagFormRequest
@@ -68,9 +68,11 @@ class TagFormRequest extends Request
      */
     public function rules()
     {
-        $idRule  = '';
-        $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag';
-        if (Tag::find($this->get('id'))) {
+        /** @var TagRepositoryInterface $repository */
+        $repository = app(TagRepositoryInterface::class);
+        $idRule     = '';
+        $tagRule    = 'required|min:1|uniqueObjectForUser:tags,tag';
+        if (!is_null($repository->find(intval($this->get('id')))->id)) {
             $idRule  = 'belongsToUser:tags';
             $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,' . $this->get('id');
         }