diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php
index 5e179917..1e9be5f3 100644
--- a/www/lib/class.erpapi.php
+++ b/www/lib/class.erpapi.php
@@ -29779,8 +29779,14 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
 */
 // Force only existing emailbackup accounts
 
+    $tpl = "<option value=\"\">-</option>";
+
     $email_addr = $this->app->DB->SelectArr("SELECT email, angezeigtername FROM emailbackup WHERE email != '' AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email");
 
+    if (empty($email_addr)) {
+      return "";
+    }
+
     foreach($email_addr AS $mail)
     {
       if($mail['angezeigtername']!="") $emails[] = $mail['angezeigtername']." &lt;".$mail['email']."&gt;";
@@ -29789,7 +29795,6 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
 
     $emails = array_keys(array_flip($emails));
 
-
     for($i=0;$i<(!empty($emails)?count($emails):0);$i++)
     {
       if($emails[$i]===$selected) $mark="selected"; else $mark="";
@@ -29820,8 +29825,14 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
 */
 // Force only existing emailbackup accounts
 
+    $tpl = "<option value=\"\">-</option>";
+
     $email_addr = $this->app->DB->SelectArr("SELECT email FROM emailbackup WHERE email != '' AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email");
 
+    if (empty($email_addr)) {
+      return "";
+    }
+
     foreach($email_addr AS $mail) {
       $emails[] = $mail['email'];
     }
diff --git a/www/pages/firmendaten.php b/www/pages/firmendaten.php
index 3217ea40..42e0c28c 100644
--- a/www/pages/firmendaten.php
+++ b/www/pages/firmendaten.php
@@ -467,8 +467,8 @@ class Firmendaten  {
         $this->app->erp->Firmendaten('email'),
         $this->app->erp->Firmendaten('absendername'),
         $this->app->erp->Firmendaten('testmailempfaenger'),
-        'Testmail Empfaenger',
-        'Xentral ERP: Testmail',
+        $this->app->erp->Firmendaten('testmailempfaenger'),
+        'Xenomporio ERP: Testmail',
         'Dies ist eine Testmail',
         '',0,true,'','',
         true