diff --git a/app/Http/ValidationRules/Project/ValidProjectForClient.php b/app/Http/ValidationRules/Project/ValidProjectForClient.php
index 9030c5985e..410348a925 100644
--- a/app/Http/ValidationRules/Project/ValidProjectForClient.php
+++ b/app/Http/ValidationRules/Project/ValidProjectForClient.php
@@ -24,6 +24,8 @@ class ValidProjectForClient implements Rule
 
     public $input;
 
+    public $message;
+
     public function __construct($input)
     {
         $this->input = $input;
@@ -35,15 +37,20 @@ class ValidProjectForClient implements Rule
      */
     public function passes($attribute, $value)
     {
+        $this->message = ctrans('texts.project_client_do_not_match');
+
         if (empty($this->input['project_id'])) {
             return true;
         }
         
-        if (is_string($this->input['project_id'])) {
-            $this->input['project_id'] = $this->decodePrimaryKey($this->input['project_id']);
-        }
+        // if (is_string($this->input['project_id'])) {
+        //     $this->input['project_id'] = $this->decodePrimaryKey($this->input['project_id']);
+        // }
 
-        $project = Project::findOrFail($this->input['project_id']);
+        $project = Project::find($this->input['project_id']);
+
+        if(!$project)
+            $this->message = "Project not found";
 
         return $project->client_id == $this->input['client_id'];
     }
@@ -53,6 +60,6 @@ class ValidProjectForClient implements Rule
      */
     public function message()
     {
-        return ctrans('texts.project_client_do_not_match');
+        return $this->message;
     }
 }
diff --git a/app/Jobs/Import/CSVImport.php b/app/Jobs/Import/CSVImport.php
index b5896b5320..c893530b4e 100644
--- a/app/Jobs/Import/CSVImport.php
+++ b/app/Jobs/Import/CSVImport.php
@@ -134,10 +134,6 @@ class CSVImport implements ShouldQueue {
 			'company' => $this->company,
 		];
 
-        App::forgetInstance('translator');
-        $t = app('translator');
-        $t->replace(Ninja::transformTranslations($this->company->settings));
-
 		$nmo = new NinjaMailerObject;
 		$nmo->mailable = new ImportCompleted($this->company, $data);
 		$nmo->company = $this->company;
diff --git a/app/Mail/Import/ImportCompleted.php b/app/Mail/Import/ImportCompleted.php
index b6fdbfd4f4..2a1e04da60 100644
--- a/app/Mail/Import/ImportCompleted.php
+++ b/app/Mail/Import/ImportCompleted.php
@@ -13,9 +13,11 @@
 namespace App\Mail\Import;
 
 use App\Models\Company;
+use App\Utils\Ninja;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\App;
 
 class ImportCompleted extends Mailable
 {
@@ -45,6 +47,11 @@ class ImportCompleted extends Mailable
      */
     public function build()
     {
+
+        App::forgetInstance('translator');
+        $t = app('translator');
+        $t->replace(Ninja::transformTranslations($this->company->settings));
+
         $data = array_merge($this->data, [
             'logo' => $this->company->present()->logo(),
             'settings' => $this->company->settings,