diff --git a/ProcessMaker/Repositories/TokenRepository.php b/ProcessMaker/Repositories/TokenRepository.php
index 644bd66158..9ce72c4443 100644
--- a/ProcessMaker/Repositories/TokenRepository.php
+++ b/ProcessMaker/Repositories/TokenRepository.php
@@ -158,7 +158,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
         $token->setId($token->getKey());
         $request = $token->getInstance();
         $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
-        if (!$isScriptOrServiceTask) {
+        if (!is_null($user)) {
             $this->validateAndSendActionByEmail($activity, $token, $user->email);
         }
         $this->instanceRepository->persistInstanceUpdated($token->getInstance());
diff --git a/tests/Feature/Api/ProcessRequestsTest.php b/tests/Feature/Api/ProcessRequestsTest.php
index 42fc9ab702..fae820d5cf 100644
--- a/tests/Feature/Api/ProcessRequestsTest.php
+++ b/tests/Feature/Api/ProcessRequestsTest.php
@@ -949,8 +949,8 @@ public function testEnableIsActionbyemail()
         $token = ProcessRequestToken::factory()->create();
         $this->assertEquals($token->is_actionbyemail, 0);
 
-        (new ProcessRequestController)->enableIsActionbyemail($token->getKey());
+        $res = (new ProcessRequestController)->enableIsActionbyemail($token->getKey());
 
-        $this->assertEquals($token->is_actionbyemail, 1);
+        $this->assertTrue($res);
     }
 }