diff --git a/controller/Account/LoginController.php b/controller/Account/LoginController.php
index 848c7e9c50c586539e278f4520a14687a5bb04a7..390f2102dfa5a8835283ff2d848e2542910c3af5 100644
--- a/controller/Account/LoginController.php
+++ b/controller/Account/LoginController.php
@@ -41,7 +41,7 @@ class LoginController extends BaseController {
                 }
             }
             if (isset($user)) {
-                if ($user->password === $this->getArg('password')) {
+                if (password_verify($this->getArg('password'), $user->password)) {
                     $this->setResponse(200, "Logged in");
                     // Do logging in.
                     if (isset($token)) {
@@ -60,7 +60,7 @@ class LoginController extends BaseController {
                     }
                     return $token->asArray();
                 } else {
-                    $this->setResponse(401, "Invalid username/password.");
+                    $this->setResponse(401, "Invalid username/password." . $this->getArg('password') . ' - ' . $user->password);
                     return $this->getArg('username');
                 }
             } else {
diff --git a/entity/AccountEntity.php b/entity/AccountEntity.php
index b13024ae6c428a96123da216846780e6cdf43950..df81e3c3bfeeca897452b8ab80901fac35135672 100644
--- a/entity/AccountEntity.php
+++ b/entity/AccountEntity.php
@@ -19,7 +19,8 @@ class AccountEntity extends BaseEntity {
      */
     public function load($data) {
         $this->username = BaseEntity::get($data, "username", ['JLAS\\Book\\Entity\\AccountEntity', 'isUsernameValid']);
-        $this->password = BaseEntity::get($data, "password", ['JLAS\\Book\\Entity\\AccountEntity', 'isPasswordValid']);
+        // $this->password = BaseEntity::get($data, "password", ['JLAS\\Book\\Entity\\AccountEntity', 'isPasswordValid']);
+        $this->password = BaseEntity::get($data, "password");
     }
 
     /**
diff --git a/model/AccountModel.php b/model/AccountModel.php
index 32b0a7aa451a84e6d3d80c254ae294acfcaa3692..c757424cecbe2aebd5550ec5eed0743ba445dea6 100644
--- a/model/AccountModel.php
+++ b/model/AccountModel.php
@@ -49,7 +49,7 @@ class AccountModel extends BaseModel {
             "INSERT INTO $this->table (`username`, `password`) VALUES (:username, :password)",
             array(
                 ":username" => $entity->username,
-                ":password" => $entity->password,
+                ":password" => password_hash($entity->password, PASSWORD_BCRYPT),
             )
         );
         return $result;
@@ -65,7 +65,7 @@ class AccountModel extends BaseModel {
             "UPDATE $this->table SET `password`=:password WHERE `username`=:username",
             array(
                 ":username" => $entity->username,
-                ":password" => $entity->password,
+                ":password" => password_hash($entity->password, PASSWORD_BCRYPT),
             )
         );
         return $result;