diff --git a/src/views/install.hbs b/src/views/install.hbs
index 0a3442d65..faf804177 100644
--- a/src/views/install.hbs
+++ b/src/views/install.hbs
@@ -749,7 +749,7 @@
             }
 
             function validateEmail(email) {
-                var mailFormat = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
+                var mailFormat = /^\w+([.-]\w+)*@\w+([.-]\w+)*(\.\w+)+$/;
                 return email.match(mailFormat);
             }
 
diff --git a/src/views/pub_createTicket.hbs b/src/views/pub_createTicket.hbs
index 1d7fa171b..9de57b439 100644
--- a/src/views/pub_createTicket.hbs
+++ b/src/views/pub_createTicket.hbs
@@ -744,7 +744,7 @@
             }
 
             function validateEmail(email) {
-                var mailFormat = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
+                var mailFormat = /^\w+([.-]\w+)*@\w+([.-]\w+)*(\.\w+)+$/;
                 return email.match(mailFormat);
             }
 
diff --git a/src/views/pub_signup.hbs b/src/views/pub_signup.hbs
index 3b5fc86c0..68bcff2df 100644
--- a/src/views/pub_signup.hbs
+++ b/src/views/pub_signup.hbs
@@ -695,7 +695,7 @@
             }
 
             function validateEmail(email) {
-                var mailFormat = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
+                var mailFormat = /^\w+([.-]\w+)*@\w+([.-]\w+)*(\.\w+)+$/;
                 return email.match(mailFormat);
             }