diff --git a/app/Models/User.php b/app/Models/User.php
index 60e9a3e9..f965087f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -73,10 +73,12 @@ class User extends Model
         $responses = event(new EncryptUserPassword($raw_passwd, $this));
 
         if (isset($responses[0])) {
-            $this->password = $responses[0];
+            $encrypted = $responses[0];
+        } else {
+            $encrypted = app('cipher')->encrypt($raw_passwd, config('secure.salt'));
         }
 
-        return (app('cipher')->encrypt($raw_passwd, config('secure.salt')) == $this->password);
+        return ($encrypted == $this->password);
     }
 
     /**