diff --git a/embedathon/admin.py b/embedathon/admin.py
index 85587c5..210c488 100644
--- a/embedathon/admin.py
+++ b/embedathon/admin.py
@@ -66,9 +66,14 @@ class Meta:
         fields = ('id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'phone', 'ieee_number', 'college_name', 'team_leader', 'team_member')
 
 class MyUserAdmin(ExportMixin, UserAdmin):
-    list_display = ("username", "email", "first_name", "last_name", "phone", "college_name", "ieee_number", "is_staff")
+    list_display = ("username", "email", "first_name", "last_name", "phone", "college_name", "ieee_number")
     list_filter = ("is_staff", "is_nitk", "is_active", "groups")
     resource_classes = (UserResource,)
+    fieldsets = (
+        (None, {"fields": ("username", "password")}),
+        (("Personal info"), {"fields": ("first_name", "last_name", "email", "phone", "college_name", "ieee_number", "is_nitk")}),
+        (("Important dates"), {"fields": ("last_login", "date_joined")}),
+    )
 
 admin.site.register(User, MyUserAdmin)
 admin.site.register(Team, TeamAdmin)