diff --git a/webui/controller/domain/remove.php b/webui/controller/domain/remove.php
index 8c873beb..99141216 100644
--- a/webui/controller/domain/remove.php
+++ b/webui/controller/domain/remove.php
@@ -56,7 +56,7 @@ class ControllerDomainRemove extends Controller {
          $this->error['admin'] = $this->data['text_you_are_not_admin'];
       }
 
-      if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['name'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->get['name'])) ) {
+      if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['name'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,10})$/', $this->request->get['name'])) ) {
          $this->error['domain'] = $this->data['text_invalid_data'];
       }
 
diff --git a/webui/controller/message/bulkrestore.php b/webui/controller/message/bulkrestore.php
index ed776299..8301e516 100644
--- a/webui/controller/message/bulkrestore.php
+++ b/webui/controller/message/bulkrestore.php
@@ -69,7 +69,7 @@ class ControllerMessageBulkrestore extends Controller {
                $rcpt[0] = $email;
             }
             else {
-               $rcpt = $this->model_search_search->get_message_recipients($id);
+               $rcpt[0] = $session->get("email");
             }
          }
          else {