diff --git a/apps/account/admin/user.py b/apps/account/admin/user.py
index 2ded8a9..e7ffe39 100644
--- a/apps/account/admin/user.py
+++ b/apps/account/admin/user.py
@@ -28,9 +28,9 @@ class NotificationAdmin(AjaxDatatable):
 @admin.register(User)    
 class UserAdmin(UserAdmin, AjaxDatatable):
     list_display = (
-        'email', 'fullname', 'user_type','last_login', 'date_joined', 
+        'email', 'device_id', 'fullname', 'user_type','last_login', 'device_os', 'date_joined', 
         )
-    ordering = 'last_login',
+    ordering = '-id',
     readonly_fields = ('date_joined',)
     exclude = ('password', 'user_permissions')
     add_fieldsets = (
diff --git a/apps/account/custom_user_login.py b/apps/account/custom_user_login.py
index 2a41354..5f78bac 100644
--- a/apps/account/custom_user_login.py
+++ b/apps/account/custom_user_login.py
@@ -20,6 +20,6 @@ class CustomLoginBackend(BaseBackend):
 
     def get_user(self, username):
         try:
-            return User.objects.filter(Q(email=username) | Q(phone_number=username)).first()
-        except Exception.DoesNotExist:
+            return User.objects.filter(Q(email=username) | Q(phone_number=str(username)) | Q(id=int(username))).first()
+        except User.DoesNotExist:
             return None
diff --git a/config/test_auth_middleware.py b/config/test_auth_middleware.py
index f647e69..c1bbfd4 100644
--- a/config/test_auth_middleware.py
+++ b/config/test_auth_middleware.py
@@ -18,7 +18,7 @@ def test_auth_middleware(get_response):
 
         if "/swagger" in request.path or "/redoc" in request.path:
             if not request.META.get('HTTP_AUTHORIZATION'):
-                user = User.objects.filter(is_staff=True, email="aqila@gmail.com").first()
+                user = User.objects.filter(is_staff=True, email="admin@gmail.com").first()
                 if user:
                     t, _ = Token.objects.get_or_create(user=user)
                     request.META['HTTP_AUTHORIZATION'] = f"Token {t}"