diff --git a/core/core.services.yml b/core/core.services.yml
index f5ed5db..6ded521 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1045,3 +1045,5 @@ services:
     arguments: ['@module_handler']
     tags:
       - { name: mime_type_guesser }
+  email.validator:
+    class: Egulias\EmailValidator\EmailValidator
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 3b6f1dd..1db96ff 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -345,17 +345,14 @@ 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);
+  return \Drupal::service('email.validator')->isValid($mail);
 }
 
 /**