diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
index 3a933bdea41..fa74e8455fc 100644
--- a/app/components/forms/orders/order-form.js
+++ b/app/components/forms/orders/order-form.js
@@ -8,12 +8,13 @@ import moment from 'moment';
 import { groupBy, orderBy } from 'lodash-es';
 import {
   compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern,
-  validGithubProfileUrlPattern
+  validGithubProfileUrlPattern, validEmail
 } from 'open-event-frontend/utils/validators';
 import { genders } from 'open-event-frontend/utils/dictionary/genders';
 import { ageGroups } from 'open-event-frontend/utils/dictionary/age-groups';
 import { countries } from 'open-event-frontend/utils/dictionary/demography';
 
+
 export default Component.extend(FormMixin, {
   router: service(),
 
@@ -89,7 +90,8 @@ export default Component.extend(FormMixin, {
           prompt : this.l10n.t('Please enter your email')
         },
         {
-          type   : 'email',
+          type   : 'regExp',
+          value  : validEmail,
           prompt : this.l10n.t('Please enter a valid email address')
         }
       ]
@@ -382,7 +384,8 @@ export default Component.extend(FormMixin, {
           identifier : 'email',
           rules      : [
             {
-              type   : 'email',
+              type   : 'regExp',
+              value  : validEmail,
               prompt : this.l10n.t('Please enter a valid email address')
             }
           ]
diff --git a/app/utils/validators.js b/app/utils/validators.js
index 2595b5c9f08..1afbcc38f1c 100644
--- a/app/utils/validators.js
+++ b/app/utils/validators.js
@@ -79,6 +79,11 @@ export const validPhoneNumber = new RegExp(
   '^\\s*(?:\\+?(\\d{1,3}))?([-. (]*(\\d{3})[-. )]*)?((\\d{3})[-. ]*(\\d{2,4})(?:[-.x ]*(\\d+))?)\\s*$'
 );
 
+export const validEmail = new RegExp(
+  /* eslint-disable-next-line no-control-regex*/
+  '[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n]+'
+);
+
 export const isValidUrl = str => {
   return validUrlPattern.test(str);
 };