diff --git a/app/models/Data/User.php b/app/models/Data/User.php
index fdeb5bf..425ec3e 100644
--- a/app/models/Data/User.php
+++ b/app/models/Data/User.php
@@ -281,8 +281,8 @@ class User extends Model
     static public function findFirstByUsernameOrEmail($value)
     {
         return self::findFirst([
-            "email = :v: OR username = :v:",
-            "bind" => [ 'v' => $value ]
+            "(email = :v: OR username = :v:) AND status = :s:",
+            "bind" => [ 'v' => $value, 's' => self::STATUS_ACTIVE ]
         ]);
     }