diff --git a/profiles/admin.py b/profiles/admin.py
index 7927dd270867e964778dfbcc3fce11557d8c2e90..ede88a8cbcfa20d273dff2e7c659a4ff5f994616 100644
--- a/profiles/admin.py
+++ b/profiles/admin.py
@@ -4,7 +4,22 @@ from django.contrib.auth.admin import UserAdmin
 from . import models
 
 
-admin.site.register(models.User, UserAdmin)
+class CustomUserAdmin(UserAdmin):
+    list_display = UserAdmin.list_display + ('organisational_unit',)
+
+    fieldsets = (
+        (None,
+            {'fields': ('username', 'password')}),
+        ('Personal info',
+            {'fields': ('first_name', 'last_name', 'email', 'organisational_unit')}),
+        ('Permissions',
+            {'fields': ('is_active', 'is_staff', 'is_superuser', 'is_auditor', 'is_superauditor', 'groups', 'user_permissions')}),
+        ('Important dates',
+            {'fields': ('last_login', 'date_joined')}),
+    )
+
+
+admin.site.register(models.User, CustomUserAdmin)
 
 
 @admin.register(models.OrganisationalUnit)