diff --git a/plist b/plist
index d40fbdb43..3548d4d01 100644
--- a/plist
+++ b/plist
@@ -590,6 +590,7 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/Validation.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/CallbackValidator.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/CsvListValidator.php
+/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/Email.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/InclusionIn.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/MinMaxValidator.php
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/EmailField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/EmailField.php
index b8ad1694e..f3e598e4f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/EmailField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/EmailField.php
@@ -28,7 +28,7 @@
 
 namespace OPNsense\Base\FieldTypes;
 
-use Phalcon\Filter\Validation\Validator\Email;
+use OPNsense\Base\Validators\Email;
 
 /**
  * Class EmailField
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/Email.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/Email.php
new file mode 100644
index 000000000..59a71c028
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/Email.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ *    Copyright (C) 2015 Deciso B.V.
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Base\Validators;
+
+use OPNsense\Base\BaseValidator;
+use OPNsense\Base\Messages\Message;
+
+/**
+ * @package OPNsense\Base\Validators
+ */
+class Email extends BaseValidator
+{
+    /**
+     * Executes validation
+     *
+     * @param $validator
+     * @param string $attribute
+     * @return boolean
+     */
+    public function validate($validator, $attribute): bool
+    {
+        $value = $validator->getValue($attribute);
+        $msg = $this->getOption('message');
+        if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
+            $validator->appendMessage(new Message($msg, $attribute, 'Email'));
+            return false;
+        }
+        return true;
+    }
+}