diff --git a/bureau/admin/mail_doedit.php b/bureau/admin/mail_doedit.php
index d1f02477..1336fb32 100644
--- a/bureau/admin/mail_doedit.php
+++ b/bureau/admin/mail_doedit.php
@@ -56,7 +56,8 @@ if (!$res=$mail->get_details($mail_id)) {
     include ("mail_edit.php");
     exit();
   } else {
-    if (!$mail->set_passwd($mail_id,$pass,($islocal == 1?false:true))) { /* SET THE PASSWORD */
+    $canbeempty = ($islocal != 1 || ($islocal == 1 && !$new_account))?true:false;
+    if (!$mail->set_passwd($mail_id,$pass,$canbeempty)) { /* SET THE PASSWORD */
       include ("mail_edit.php");
       exit();
     }