diff --git a/bureau/admin/mailautoconfig_outlook.php b/bureau/admin/mailautoconfig_outlook.php
index bd09257f..944a4515 100644
--- a/bureau/admin/mailautoconfig_outlook.php
+++ b/bureau/admin/mailautoconfig_outlook.php
@@ -9,6 +9,8 @@ if ( $_SERVER['REQUEST_METHOD'] === 'POST' ){
   $pattern = '/[A-Za-z0-9_-]+@[A-Za-z0-9_-]+.([A-Za-z0-9_-][A-Za-z0-9_]+)/'; 
   preg_match($pattern, $string, $matches); 
   $emailDomain = explode('@', $matches[0]);
+} else {
+  die(_('Missing POST of the mail address'));
 }
 
 header("Content-type: text/xml");
diff --git a/bureau/admin/mailautoconfig_thunderbird.php b/bureau/admin/mailautoconfig_thunderbird.php
index 6c834104..e61441ea 100644
--- a/bureau/admin/mailautoconfig_thunderbird.php
+++ b/bureau/admin/mailautoconfig_thunderbird.php
@@ -2,11 +2,15 @@
 require_once("../class/config_nochk.php");
 
 header ("Content-Type:text/xml");
+
+if (empty($_GET['emailaddress'])) die(_("Error: Missing GET of emailaddress"));
+
 $emailDomain = explode('@', rawurldecode($_GET['emailaddress']));
+if (empty($emailDomain)) die(_('Error: Empty $emailDomain'));
 ?>
 <clientConfig version="1.1">
 <emailProvider id="<?php echo $L_FQDN ?>">
-<domain><?php echo $emailDomain;?></domain>
+<domain><?php echo $emailDomain[1];?></domain>
 <displayName><?php echo $L_FQDN ?></displayName>
 <displayShortName><?php echo $L_FQDN ?></displayShortName>
 	<incomingServer type="imap">