diff --git a/app/Http/Controllers/TwilioController.php b/app/Http/Controllers/TwilioController.php
index c43ba09d7365..ed6044995b12 100644
--- a/app/Http/Controllers/TwilioController.php
+++ b/app/Http/Controllers/TwilioController.php
@@ -22,6 +22,11 @@ use Twilio\Rest\Client;
 class TwilioController extends BaseController
 {
 
+    private array $invalid_codes = [
+        '+21',
+        '+17152567760',
+    ];
+
     public function __construct()
     {
         parent::__construct();
@@ -39,7 +44,7 @@ class TwilioController extends BaseController
 
         $account = $user->company()->account;
 
-        if(stripos($request->phone, '+21') !== false) {
+        if(!$this->checkPhoneValidity($request->phone)) {
             return response()->json(['message' => 'This phone number is not supported'], 400);
         }
 
@@ -70,6 +75,19 @@ class TwilioController extends BaseController
         return response()->json(['message' => 'Code sent.'], 200);
     }
 
+    private function checkPhoneValidity($phone)
+    {
+        foreach($this->invalid_codes as $code){
+
+            if(stripos($phone, $code) !== false) {
+                return false;
+            }
+
+            return true;
+
+        }
+    }
+
     /**
      * Show the form for creating a new resource.
      *
diff --git a/app/Jobs/PostMark/ProcessPostmarkWebhook.php b/app/Jobs/PostMark/ProcessPostmarkWebhook.php
index b66c27144965..a1b54aff4b81 100644
--- a/app/Jobs/PostMark/ProcessPostmarkWebhook.php
+++ b/app/Jobs/PostMark/ProcessPostmarkWebhook.php
@@ -305,14 +305,20 @@ class ProcessPostmarkWebhook implements ShouldQueue
 
         if($sl) {
             $this->updateSystemLog($sl, $data);
+
+            if (config('ninja.notification.slack')) {
+                $this->invitation->company->notification(new EmailSpamNotification($this->invitation->company->account))->ninja();
+            }
+
             return;
         }
 
         (new SystemLogger($data, SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_SPAM_COMPLAINT, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client, $this->invitation->company))->handle();
 
-        if (config('ninja.notification.slack')) {
-            $this->invitation->company->notification(new EmailSpamNotification($this->invitation->company->account))->ninja();
-        }
+if (config('ninja.notification.slack')) {
+    $this->invitation->company->notification(new EmailSpamNotification($this->invitation->company->account))->ninja();
+}
+
     }
 
     private function discoverInvitation($message_id)