diff --git a/security/Security.php b/security/Security.php
index 500039406db..61ff9363538 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -771,7 +771,7 @@ static function encrypt_password($password, $salt = null, $algorithm = null, $me
 			// if the password is empty, don't encrypt
 			strlen(trim($password)) == 0  
 			// if no algorithm is provided and no default is set, don't encrypt
-			|| (!$algorithm && self::$encryptPasswords == false)
+			|| (!$algorithm)
 		) {
 			$algorithm = 'none';
 		} else {