diff --git a/action.php b/action.php
index aa0dcee..00fb35c 100644
--- a/action.php
+++ b/action.php
@@ -241,8 +241,8 @@ class action_plugin_discussion extends DokuWiki_Action_Plugin{
                         $comment['user']['name'] = $INFO['userinfo']['name'];
                         $comment['user']['mail'] = $INFO['userinfo']['mail'];
                     } elseif((isset($_SERVER['REMOTE_USER']) && $this->getConf('adminimport') && auth_ismanager()) || !isset($_SERVER['REMOTE_USER'])) {
-                        if(empty($_REQUEST['name']) or empty($_REQUEST['mail'])) return; // don't add anonymous comments
-                        if(!mail_isvalid($_REQUEST['mail'])) {
+                        if(empty($_REQUEST['name'])) return; // don't add anonymous comments
+                        if(!empty($_REQUEST['mail']) && !mail_isvalid($_REQUEST['mail'])) {
                             msg($lang['regbadmail'], -1);
                             return;
                         } else {
diff --git a/script.js b/script.js
index 79e04c7..b9a7d86 100644
--- a/script.js
+++ b/script.js
@@ -35,7 +35,7 @@ function validate(form){
     if (isBlank(form.mail.value) || form.mail.value.indexOf("@") == -1){
         form.mail.focus();
         form.mail.style.backgroundColor = '#fcc';
-        return false;
+        //return false;
     } else {
         form.mail.style.backgroundColor = '#fff';
     }