diff --git a/backend/app/User/Controller/Auth/AuthController.php b/backend/app/User/Controller/Auth/AuthController.php
index 0d09f03f..4dcabe15 100644
--- a/backend/app/User/Controller/Auth/AuthController.php
+++ b/backend/app/User/Controller/Auth/AuthController.php
@@ -33,17 +33,12 @@ class AuthController extends Controller
 
     public function login(LoginRequest $request): JsonResponse
     {
-        $user = null;
+        $uniq_identifier = $request->input('login');
+        $user = User::query()
+            ->where('email', $uniq_identifier)
+            ->orWhere('username', $uniq_identifier)
+            ->first();
 
-        if ($request->filled('email')) {
-            $user = User::query()
-                ->where('email', $request->email)
-                ->first();
-        } elseif ($request->filled('username')) {
-            $user = User::query()
-                ->where('username', $request->username)
-                ->first();
-        }
 
         if (!$user || !Hash::check($request->password, $user->password)) {
             return $this->errorResponse('');