diff --git a/core/includes/common.inc b/core/includes/common.inc
index fde8b06..702e8d2 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -34,6 +34,7 @@
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Session\AnonymousUserSession;
+use Egulias\EmailValidator\EmailValidator;
 
 /**
  * @defgroup php_wrappers PHP wrapper functions
@@ -345,17 +346,15 @@ function drupal_get_destination() {
 /**
  * Verifies the syntax of the given email address.
  *
- * This uses the
- * @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
- *
- * @param $mail
+ * @param string $mail
  *   A string containing an email address.
  *
- * @return
+ * @return bool
  *   TRUE if the address is in a valid format.
  */
 function valid_email_address($mail) {
-  return (bool)filter_var($mail, FILTER_VALIDATE_EMAIL);
+  $validator = new EmailValidator(TRUE);
+  return $validator->isValid($mail);
 }
 
 /**