diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 0f7d8e7125..cbd138a0bc 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -234,6 +234,7 @@ p a {
 		<li>[Feature] Show resulting permission alone in trace window (Bug #10953) - thanks to dark/rain for the proposal</li>
 		<li>[Fix] Fixed bug in realpath replacement letting it actually work again</li>
 		<li>[Change] Try to be a bit more specific regarding global/local permission trace (Bug #11032)</li>
+		<li>[Fix] Fixed some strangeness in password validation due to mb_ereg()</li>
 
 	</ul>
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 46ea90fa3a..8750ca91a0 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1500,7 +1500,7 @@ function validate_password($password)
 	{
 		foreach ($chars as $char)
 		{
-			if (!mb_ereg_match($char, $password))
+			if (mb_ereg($char, $password) === false)
 			{
 				return 'INVALID_CHARS';
 			}