diff --git a/process/CommunicationBlacklist_lib/process.js b/process/CommunicationBlacklist_lib/process.js
index 880cec7d0e86d000377611c801bdbc354cc6806d..81a4cb149c2a26d592688abdd8a7d9c0f9274436 100644
--- a/process/CommunicationBlacklist_lib/process.js
+++ b/process/CommunicationBlacklist_lib/process.js
@@ -45,17 +45,21 @@ CommunicationBlacklist.prototype.getFilter = function ()
 
 CommunicationBlacklist.prototype.loadBlacklistRecipients = function (pBulkMailId)
 {
-    var blacklistLoadConfig = entities.createConfigForLoadingRows()
-        .fields(["CONTACT_ID"])
-        .entity("BulkMailRecipient_entity")
-        .provider("RecipientsToBeMailed")
-        .addParameter("BulkMailId_param", pBulkMailId)
-        .filter(JSON.stringify(this.filter));
-    var blacklist = entities.getRows(blacklistLoadConfig);
-    blacklist.forEach(function (recipient)
+    if (!Utils.isNullOrEmpty(this.filter.childs))   
     {
-        this.blacklistContactIds.add(recipient["CONTACT_ID"]);
-    }, this);
+        var blacklistLoadConfig = entities.createConfigForLoadingRows()
+            .fields(["CONTACT_ID"])
+            .entity("BulkMailRecipient_entity")
+            .provider("RecipientsToBeMailed")
+            .addParameter("BulkMailId_param", pBulkMailId)
+            .filter(JSON.stringify(this.filter));
+        var blacklist = entities.getRows(blacklistLoadConfig);
+        blacklist.forEach(function (recipient)
+        {
+            this.blacklistContactIds.add(recipient["CONTACT_ID"]);
+        }, this);
+    }
+    
     return this;
 }
 
diff --git a/process/IncomingEmailExecutor_lib/process.js b/process/IncomingEmailExecutor_lib/process.js
index 56d5ce0aee24b8c2ec5de20d41efbe3260bc8d59..1df8d599c310557b625fd6430ab7c012b240932d 100644
--- a/process/IncomingEmailExecutor_lib/process.js
+++ b/process/IncomingEmailExecutor_lib/process.js
@@ -98,7 +98,6 @@ IncomingEmailExecutor.prototype.setActivityEmployeeContact = function(pContactId
     else
     {
         this.activityData.employeeContactId = pContactId;
-        this.activityData.links.push(["Person", pContactId]);
         this.activityData.employeeContactLanguage = pLanguageIso3;
     }
 }
@@ -324,12 +323,9 @@ IncomingEmailExecutor.prototype.createActivity = function(pAdditionalLinks, pIsE
         failback: []
     };
     
-    if (Utils.toBoolean(vars.get("$sys.isserver"))) 
-    {
         this.getSenderInfo().forEach(this._getProcessingFunction(true, senderContacts), this);
         this.activityData.links = this.activityData.links.concat(senderContacts.prefered.length > 0 ? senderContacts.prefered : 
                                                                     senderContacts.failback);
-    }
     
     for (var i = 0, l = this.mailRecipients.length; i < l; i++)
     {