diff --git a/app/Lib/Tools/BlowfishPasswordHasherConstant.php b/app/Lib/Tools/BlowfishPasswordHasherConstant.php
new file mode 100644
index 000000000..7eb60e56c
--- /dev/null
+++ b/app/Lib/Tools/BlowfishPasswordHasherConstant.php
@@ -0,0 +1,12 @@
+<?php
+class BlowfishPasswordHasherConstant extends BlowfishPasswordHasher
+{
+    /**
+     * @param string $password
+     * @param string $hashedPassword
+     * @return bool
+     */
+    public function check($password, $hashedPassword) {
+        return hash_equals($hashedPassword, Security::hash($password, 'blowfish', $hashedPassword));
+    }
+}
diff --git a/app/Model/AuthKey.php b/app/Model/AuthKey.php
index a4d76d2a3..ca4554c4b 100644
--- a/app/Model/AuthKey.php
+++ b/app/Model/AuthKey.php
@@ -2,6 +2,7 @@
 App::uses('AppModel', 'Model');
 App::uses('RandomTool', 'Tools');
 App::uses('CidrTool', 'Tools');
+App::uses('BlowfishPasswordHasherConstant', 'Tools');
 
 /**
  * @property User $User
@@ -331,6 +332,6 @@ class AuthKey extends AppModel
      */
     private function getHasher()
     {
-        return new BlowfishPasswordHasher();
+        return new BlowfishPasswordHasherConstant();
     }
 }
diff --git a/app/Model/User.php b/app/Model/User.php
index f2495155b..3ee67fba4 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -4,6 +4,7 @@ App::uses('AuthComponent', 'Controller/Component');
 App::uses('RandomTool', 'Tools');
 App::uses('GpgTool', 'Tools');
 App::uses('SendEmail', 'Tools');
+App::uses('BlowfishPasswordHasherConstant', 'Tools');
 
 /**
  * @property Log $Log
@@ -1007,7 +1008,7 @@ class User extends AppModel
             App::uses('SimplePasswordHasher', 'Controller/Component/Auth');
             $passwordHasher = new SimplePasswordHasher();
         } else {
-            $passwordHasher = new BlowfishPasswordHasher();
+            $passwordHasher = new BlowfishPasswordHasherConstant();
         }
         $hashed = $passwordHasher->check($password, $currentUser['User']['password']);
         return $hashed;