diff --git a/src/app/Rules/CheckUsedPasswordRule.php b/src/app/Rules/CheckUsedPasswordRule.php
index 858af99..617b623 100644
--- a/src/app/Rules/CheckUsedPasswordRule.php
+++ b/src/app/Rules/CheckUsedPasswordRule.php
@@ -18,12 +18,13 @@ class CheckUsedPasswordRule implements ValidationRule, DataAwareRule
     {
         $usernameColumn = config('ae3auth-config.user.username_column');
         $userModel = config('ae3auth-config.user.user_model');
-        if (!$user = auth()->user()) {
+        if (auth()->user()) {
             $user = $userModel::firstWhere($usernameColumn, $this->data[$usernameColumn]);
-            $user ?: $fail(__('failed'));
-        }
-        if (!PasswordHistoryManager::inHistory($user->id, $value)) {
-            $fail(__('auth.password_used'));
+            if (!PasswordHistoryManager::inHistory($user->id, $value))
+                $fail(__('auth.password_used'));
+            else
+                $fail(__('failed'));
+
         }
     }