diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index c3a1d3c5759b118fd0d3d4e30e38f246a3f28166..8b0160a2bde8ebbc8f8d15af62dead828d7bfa81 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -18,5 +18,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
-    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 373495625a441019c820af8d3bfc4578ecbe0afc..46a06987353e6c3f5560722bfa75240ea024f14d 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -380,8 +380,25 @@ Email.prototype.send = function (pUser)
         
         if (this.sender)
             mail.setSender(mailId, this.sender);
-    
-        var sentMails = mail.sendMailAs(pUser || "mailbridge", mailId)
+        var mailbridgeTitle = "mailbridge";
+        
+        
+        var sentMails;
+        if(pUser)
+            sentMails = mail.sendMailAs(pUser, mailId)
+        else
+        {
+            let mailbridgeExists = newSelect("ADITO.ASYS_USERS.PROPVAL")
+                                            .from("ADITO.ASYS_USERS")
+                                            .where("ADITO.ASYS_USERS.PROPVAL", "title")
+                                            .and("ADITO.ASYS_USERS.PROPVAL", mailbridgeTitle)
+                                            .cell();
+            if(mailbridgeExists)
+                mail.sendMailAs(mailbridgeTitle, mailId)
+            else
+                throw new Error(translate.withArguments("Mailbridge failed, user %0 is unknown, contact an administrator.", [mailbridgeTitle]));
+        }
+            
         // remove from cache
         mail.deleteMail(mailId)
         return sentMails > 0;