diff --git a/lib/Cake/Utility/Security.php b/lib/Cake/Utility/Security.php
index c884d2662..84369e04d 100644
--- a/lib/Cake/Utility/Security.php
+++ b/lib/Cake/Utility/Security.php
@@ -272,8 +272,7 @@ class Security {
 				$salt,
 			);
 			$salt = vsprintf($saltFormat[$hashType], $vspArgs);
-		}
-		if ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 12) {
+		} elseif ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 29) {
 			trigger_error(__d(
 				'cake_dev',
 				'Invalid salt: %s for %s Please visit http://www.php.net/crypt and read the appropriate section for building %s salts.',