diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 5e056b9be76761e3e2a61835ef47c8d3e761ad3d..8b633511b0c4c9faba5f9e3b50735af40f527318 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7269,6 +7269,9 @@
     <entry>
       <key>Favoritegroup</key>
     </entry>
+    <entry>
+      <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e65b895509e9ced245bbfda2736f56742b573897..61cbdca2017302dd4a0d634690f5f5ba38d10044 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9642,6 +9642,10 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>FavoriteGroup</key>
     </entry>
+    <entry>
+      <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+      <value>Mailbridge fehlgeschlagen: Benutzer '%0' ist unbekannt, kontaktieren sie einen Administrator.</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 8347bc106bd7e417f278268297161df07529049f..7b56909fe432b7642e440636ea2dbb6aaa8c9454 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7350,6 +7350,9 @@
     <entry>
       <key>Favoritegroup</key>
     </entry>
+    <entry>
+      <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 46a06987353e6c3f5560722bfa75240ea024f14d..4d83ba5711f15c75ef39f25950400f6b14f106a0 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -1,3 +1,4 @@
+import("system.question");
 import("Sql_lib");
 import("MimeType_lib");
 import("Document_lib");
@@ -388,17 +389,16 @@ Email.prototype.send = function (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)
+            let mailbridgeExists = newSelect("ASYS_USERS.PROPVAL", SqlUtils.getSystemAlias())
+                                            .from("ASYS_USERS")
+                                            .where("ASYS_USERS.PROPVAL", "title")
+                                            .and("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]));
+            else //check mailbridge user if this error gets thrown
+                question.showMessage(translate.withArguments("Mailbridge failed: user '%0' is unknown, contact an administrator.", [mailbridgeTitle]), question.ERROR, translate.text("Error"));
         }
-            
         // remove from cache
         mail.deleteMail(mailId)
         return sentMails > 0;