diff --git a/phpBB/phpbb/ban/type/base.php b/phpBB/phpbb/ban/type/base.php
index a331813ab5..70885a2847 100644
--- a/phpBB/phpbb/ban/type/base.php
+++ b/phpBB/phpbb/ban/type/base.php
@@ -61,7 +61,6 @@ abstract class base implements type_interface
 	 */
 	public function set_user(\phpbb\user $user): void
 	{
-		// TODO: Implement new logging
 		$this->user = $user;
 	}
 
diff --git a/phpBB/phpbb/ban/type/email.php b/phpBB/phpbb/ban/type/email.php
index 46905994b4..bc70cdd00e 100644
--- a/phpBB/phpbb/ban/type/email.php
+++ b/phpBB/phpbb/ban/type/email.php
@@ -40,7 +40,7 @@ class email extends base
 	{
 		$this->get_excluded();
 
-		$regex = '#^.*?@.*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i'; // TODO
+		$regex = '#^.*?@*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i';
 
 		$ban_items = [];
 		foreach ($items as $item)