diff --git a/js/src/components/Account/Login.vue b/js/src/components/Account/Login.vue
index 5babc7f8f..cfc319cf6 100644
--- a/js/src/components/Account/Login.vue
+++ b/js/src/components/Account/Login.vue
@@ -92,10 +92,7 @@
     };
     rules = {
       required: value => !!value || 'Required.',
-      email: (value) => {
-        const pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-        return pattern.test(value) || 'Invalid e-mail.';
-      },
+      email: (value) => value.includes('@') || 'Invalid e-mail.',
     };
     user: any;
 
diff --git a/js/src/components/Account/Register.vue b/js/src/components/Account/Register.vue
index 7108b9484..114521dc7 100644
--- a/js/src/components/Account/Register.vue
+++ b/js/src/components/Account/Register.vue
@@ -123,7 +123,7 @@
     rules = {
       password_length: value => value.length > 6 || 'Password must be at least 6 characters long',
       required: value => !!value || 'Required.',
-      email: (value: string) => value.indexOf('@') !== -1 || 'Invalid e-mail.',
+      email: (value: string) => value.includes('@') || 'Invalid e-mail.',
     };
 
     resetState() {