diff --git a/companies/admin.py b/companies/admin.py
index bd59f6f..d45188c 100644
--- a/companies/admin.py
+++ b/companies/admin.py
@@ -7,7 +7,7 @@ from . import models
 class CompanyAdmin(admin.ModelAdmin):
     list_display = ('short_name', 'city', 'email', 'shop', 'platform', 'sync', 'is_validated', 'is_active')
     list_filter = ('platform', 'sync', 'is_validated', 'is_active', 'city')
-    search_fields = ('short_name', 'company__company_name', 'email', 'url')
+    search_fields = ('short_name', 'company_name', 'email', 'url')
 
 
 admin.site.register(models.Company, CompanyAdmin)
diff --git a/core/admin.py b/core/admin.py
index e6daebe..81f9dab 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -3,4 +3,9 @@ from django.contrib import admin
 from . import models
 # Register your models here.
 
-admin.site.register(models.CustomUser)
+class UserAdmin(admin.ModelAdmin):
+    list_display = ('email', 'full_name', 'role', 'company', 'email_verified', 'is_active', 'is_staff', 'created', 'last_visit')
+    list_filter = ('is_active', 'is_staff', 'email_verified')
+    search_fields = ('email', 'full_name', 'company')
+
+admin.site.register(models.CustomUser, UserAdmin)