diff --git a/core/admin.py b/core/admin.py
index 72bb44d..f13f27a 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -6,8 +6,22 @@ from . import models
 
 
 class UserAdmin(admin.ModelAdmin):
+    model = models.CustomUser
+
     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__short_name')
 
+    fieldsets = (
+        (None, {'fields': ('email', 'password','full_name', 'role', 'notify','provider','email_verified','company','is_active')}),
+        ('Permissions', {'fields': ('is_staff', 'groups')}),
+    )
+
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('email', 'password1', 'password2', 'is_staff', 'is_active')}
+        ),
+    )
+
 admin.site.register(models.CustomUser, UserAdmin)