diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index cfb6592a20b2f81a333b63153a69fcf4e3c2a503..36e2858f7beb674e5905b77c07c9677d8bf0ae6b 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -207,7 +207,7 @@ class page_action extends tform_actions {
 		
     $sys_config = $app->getconf->get_global_config('mail');
     if($sys_config["enable_custom_login"] == "y") {
-        if(!isset($_POST["login"])) $this->dataRecord["login"] = $this->dataRecord["email"];
+        if(!isset($_POST["login"]) || $_POST["login"] == '') $this->dataRecord["login"] = $this->dataRecord["email"];
         elseif(strpos($_POST["login"], '@') !== false && $_POST["login"] != $this->dataRecord["email"]) $app->tform->errorMessage .= $app->tform->lng("error_login_email_txt")."<br>";
 		} else {
         $this->dataRecord["login"] = isset($this->dataRecord["email"]) ? $this->dataRecord["email"] : '';