diff --git a/src/validate/formatter/EmailFormatter.js b/src/validate/formatter/EmailFormatter.js
index 31d200f..67279f2 100644
--- a/src/validate/formatter/EmailFormatter.js
+++ b/src/validate/formatter/EmailFormatter.js
@@ -22,7 +22,7 @@
 // characters allowed in local-part, omitting dot (some of these are only
 // allowed within quotes, but we're not going to bother convuluting the regex
 // with that)
-var local_chars = '[a-zA-Z0-9!#$%&\'*+/=?^_1{|}~()\\\\" (),:;<>@\\[\\]-]';
+var local_chars = '[a-zA-Z0-9!#$%&\'*+/=?^_1{|}~-]';
 
 
 /**
diff --git a/test/validate/formatter/EmailFormatterTest.js b/test/validate/formatter/EmailFormatterTest.js
index c451f32..a1cbda4 100644
--- a/test/validate/formatter/EmailFormatterTest.js
+++ b/test/validate/formatter/EmailFormatterTest.js
@@ -34,7 +34,6 @@ describe( 'validate.formatter.StringFormat', function()
         "firstname.lastname@domain.com",
         "email@subdomain.domain.com",
         "firstname+lastname@domain.com",
-        'email"@domain.com',
         "1234567890@domain.com",
         "email@domain-one.com",
         "_______@domain.com",
@@ -50,7 +49,7 @@ describe( 'validate.formatter.StringFormat', function()
         "@domain.com",
         "Joe Smith <email@domain.com>",
         "email.domain.com",
-        // "email@domain@domain.com",
+        "email@domain@domain.com",
         ".email@domain.com",
         "email.@domain.com",
         "email..email@domain.com",
@@ -59,5 +58,17 @@ describe( 'validate.formatter.StringFormat', function()
         "email@domain",
         "email@-domain.com",
         "email@domain..com",
+        "em,ail@domain.com",
+        'em"ail@domain.com',
+        "em(ail@domain.com",
+        "em)ail@domain.com",
+        "em:ail@domain.com",
+        "em;ail@domain.com",
+        "em<ail@domain.com",
+        "em>ail@domain.com",
+        "em[ail@domain.com",
+        "em]ail@domain.com",
+        "em ail@domain.com",
+        "em\\ail@domain.com",
     ].forEach( email_address => assert.throws( () => Sut.parse( email_address ), Error ) );
 } );