diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 20e3f5785..fa1f4b3a3 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -117,7 +117,7 @@ function extractEmailAddress(mailTo) {
     var email = "";
 
     var emailre
-        = /([a-zA-Z0-9\._\-]*[a-zA-Z0-9_\-]+@[a-zA-Z0-9\._\-]*[a-zA-Z0-9])/;
+        = /([a-zA-Z0-9\._\-]*[a-zA-Z0-9_\-%\+]+@[a-zA-Z0-9\._\-]*[a-zA-Z0-9])/;
     if (emailre.test(mailTo)) {
         emailre.exec(mailTo);
         email = RegExp.$1;