diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java
index 9bf729ad25..28223f3e7f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
 @Slf4j
 public abstract class DataValidator<D extends BaseData<?>> {
     private static final Pattern EMAIL_PATTERN =
-            Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$", Pattern.CASE_INSENSITIVE);
+            Pattern.compile("^[A-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$", Pattern.CASE_INSENSITIVE);
 
     private static final Pattern QUEUE_PATTERN = Pattern.compile("^[a-zA-Z0-9_.\\-]+$");
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
new file mode 100644
index 0000000000..c64b418fa0
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import org.junit.Test;
+import org.thingsboard.server.dao.exception.DataValidationException;
+
+public class DataValidatorTest {
+
+    @Test
+    public void validateEmail() {
+        String email = "aZ1_!#$%&'*+/=?`{|}~^.-@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail1() {
+        String email = "test:1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail2() {
+        String email = "test()1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail3() {
+        String email = "test[]1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail4() {
+        String email = "test\\1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail5() {
+        String email = "test\"1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail6() {
+        String email = "test<>1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+}
\ No newline at end of file