diff --git a/app/Http/ValidationRules/Ninja/CanAddUserRule.php b/app/Http/ValidationRules/Ninja/CanAddUserRule.php
index 4e88125507d0..6333edf1abe6 100644
--- a/app/Http/ValidationRules/Ninja/CanAddUserRule.php
+++ b/app/Http/ValidationRules/Ninja/CanAddUserRule.php
@@ -33,11 +33,13 @@ class CanAddUserRule implements Rule
     public function passes($attribute, $value)
     {
 
-        $count = CompanyUser::query()
-                            ->where('account_id', auth()->user()->account_id)
-                            ->whereNull('deleted_at')
-                            ->distinct()
-                            ->count('user_id');
+          $count = CompanyUser::query()
+                              ->where('company_user.account_id', auth()->user()->account_id)
+                              ->join('users', 'users.id', '=', 'company_user.user_id')
+                              ->whereNull('users.deleted_at')
+                              ->whereNull('company_user.deleted_at')
+                              ->distinct()
+                              ->count('company_user.user_id');
 
         return $count < auth()->user()->company()->account->num_users;
 
diff --git a/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php b/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php
index db7291dc1936..c04676b6e09a 100644
--- a/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php
+++ b/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php
@@ -33,12 +33,13 @@ class CanRestoreUserRule implements Rule
     public function passes($attribute, $value)
     {
 
-        $count = CompanyUser::query()
-                            ->where('account_id', auth()->user()->account_id)
-                            ->whereNull('deleted_at')
-                            ->distinct()
-                            ->count('user_id');
-
+          $count = CompanyUser::query()
+                              ->where('company_user.account_id', auth()->user()->account_id)
+                              ->join('users', 'users.id', '=', 'company_user.user_id')
+                              ->whereNull('users.deleted_at')
+                              ->whereNull('company_user.deleted_at')
+                              ->distinct()
+                              ->count('company_user.user_id');
 
         return $count < auth()->user()->company()->account->num_users;
 
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index e165c5102bfd..ef9ab63ecedf 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -151,6 +151,7 @@ class HtmlEngine
 
             if($this->entity->project) {
                 $data['$project.name'] = ['value' => $this->entity->project->name, 'label' => ctrans('texts.project_name')];
+                $data['$invoice.project'] = &$data['$project.name'];
             }
         }