diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 8a3c7eabcc..d77152e0cf 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -829,7 +829,7 @@ class acp_users
 
 					// Which updates do we need to do?
 					$update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false;
-					$update_password = ($data['new_password'] && !$passwords_manager->check($data['new_password'], $user_row['user_password'])) ? true : false;
+					$update_password = $data['new_password'] && !$passwords_manager->check($data['new_password'], $user_row['user_password']);
 					$update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false;
 
 					if (!sizeof($error))
diff --git a/phpBB/phpbb/passwords/driver/bcrypt.php b/phpBB/phpbb/passwords/driver/bcrypt.php
index 1d1b1e267d..b16d2ada56 100644
--- a/phpBB/phpbb/passwords/driver/bcrypt.php
+++ b/phpBB/phpbb/passwords/driver/bcrypt.php
@@ -29,9 +29,8 @@ class bcrypt extends base
 	*/
 	public function hash($password, $salt = '')
 	{
-		// The 2x and 2y prefixes of bcrypt might not be supported
-		// Revert to 2a if this is the case
-		$prefix = (!$this->is_supported()) ? '$2a$' : $this->get_prefix();
+		// Get prefix of this driver
+		$prefix = $this->get_prefix();
 
 		// Do not support 8-bit characters with $2a$ bcrypt
 		// Also see http://www.php.net/security/crypt_blowfish.php
diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php
index 08b0db29a0..72db8d200f 100644
--- a/phpBB/phpbb/passwords/driver/salted_md5.php
+++ b/phpBB/phpbb/passwords/driver/salted_md5.php
@@ -57,7 +57,7 @@ class salted_md5 extends base
 	*/
 	public function hash($password, $setting = '')
 	{
-		if ($setting != '')
+		if ($setting)
 		{
 			if (($settings = $this->get_hash_settings($setting)) === false)
 			{
@@ -95,14 +95,10 @@ class salted_md5 extends base
 	{
 		if (strlen($hash) !== 34)
 		{
-			return (md5($password) === $hash) ? true : false;
+			return md5($password) === $hash;
 		}
 
-		if ($hash === $this->hash($password, $hash))
-		{
-			return true;
-		}
-		return false;
+		return $hash === $this->hash($password, $hash);
 	}
 
 	/**
diff --git a/phpBB/phpbb/passwords/helper.php b/phpBB/phpbb/passwords/helper.php
index 20c24c5ee0..59f0bd24ef 100644
--- a/phpBB/phpbb/passwords/helper.php
+++ b/phpBB/phpbb/passwords/helper.php
@@ -26,10 +26,7 @@ class helper
 	*/
 	public function set_manager(\phpbb\passwords\manager $manager)
 	{
-		if ($this->manager === null)
-		{
-			$this->manager = $manager;
-		}
+		$this->manager = $manager;
 	}
 
 	/**