diff --git a/scm-ui-components/packages/ui-components/src/validation.js b/scm-ui-components/packages/ui-components/src/validation.js
index 561b0d79bc..fcfffcee45 100644
--- a/scm-ui-components/packages/ui-components/src/validation.js
+++ b/scm-ui-components/packages/ui-components/src/validation.js
@@ -5,7 +5,7 @@ export const isNameValid = (name: string) => {
   return nameRegex.test(name);
 };
 
-const mailRegex = /^[A-z0-9][\w.-]*@[A-z0-9][\w\-.]*\.[A-z0-9][A-z0-9-]+$/;
+const mailRegex  =  /^[ -~]+@[A-Za-z0-9][\w\-.]*\.[A-Za-z0-9][A-Za-z0-9-]+$/;
 
 export const isMailValid = (mail: string) => {
   return mailRegex.test(mail);
diff --git a/scm-ui-components/packages/ui-components/src/validation.test.js b/scm-ui-components/packages/ui-components/src/validation.test.js
index 8394c61854..d50996ff2b 100644
--- a/scm-ui-components/packages/ui-components/src/validation.test.js
+++ b/scm-ui-components/packages/ui-components/src/validation.test.js
@@ -59,9 +59,8 @@ describe("test mail validation", () => {
       "@ostfalia.de",
       "s.sdorra@",
       "s.sdorra@ostfalia",
-      "s.sdorra@@ostfalia.de",
       "s.sdorra@ ostfalia.de",
-      "s.sdorra @ostfalia.de"
+      "s.sdorra@[ostfalia.de"
     ];
     for (let mail of invalid) {
       expect(validator.isMailValid(mail)).toBe(false);
@@ -78,7 +77,9 @@ describe("test mail validation", () => {
       "s.sdorra@t.co",
       "s.sdorra@ucla.college",
       "s.sdorra@example.xn--p1ai",
-      "s.sdorra@scm.solutions"
+      "s.sdorra@scm.solutions",
+      "s'sdorra@scm.solutions",
+      "\"S Sdorra\"@scm.solutions"
     ];
     for (let mail of valid) {
       expect(validator.isMailValid(mail)).toBe(true);