diff --git a/src/AddressSearch.js b/src/AddressSearch.js
index e13d0d4cc45b6b5bd48e3cfc0076c37f709b11b2..5bf55acbe7e18524762c41c03d5bd0420ca961e5 100644
--- a/src/AddressSearch.js
+++ b/src/AddressSearch.js
@@ -86,7 +86,7 @@ export default class AddressSearch extends React.Component {
     const errorMessage = [];
     const validFirstName = /^[a-zA-Z ]{2,30}$/;
     const validLastName = /^[a-zA-Z ]{2,30}$/;
-    const validEmail = /^$|^[a-zA-Z0-9]+@[a-zA-Z0-9]+\.[A-Za-z]+$/;
+    const validEmail = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
     const validPhone = /^$|^\(?(\d{3})\)?[- ]?(\d{3})[- ]?(\d{4})$/;
 
     if (this.state.form.FNAME.toString().replace(/^\s+|\s+$/g, '') === '') {
diff --git a/src/Contact.js b/src/Contact.js
index a5aaf8622113848ebbeb8bd41d767bff734f9d87..7b6bfd0e3d23f9bd70f3678d1e82e6f35cebcfbe 100644
--- a/src/Contact.js
+++ b/src/Contact.js
@@ -55,7 +55,7 @@ export default class Contact extends React.Component {
     const errorMessage = [];
     const validFirstName = /^[a-zA-Z ]{2,30}$/;
     const validLastName = /^[a-zA-Z ]{2,30}$/;
-    const validEmail = /^$|^[a-zA-Z0-9]+@[a-zA-Z0-9]+\.[A-Za-z]+$/;
+    const validEmail = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
     const validPhone = /^$|^\(?(\d{3})\)?[- ]?(\d{3})[- ]?(\d{4})$/;
 
     if (this.state.form.FNAME.toString().replace(/^\s+|\s+$/g, '') === '') {