diff --git a/panikdb/aa/admin.py b/panikdb/aa/admin.py
index d18a735223ac749dae7c0b5f85d165d141da8392..27cd8986aa7a270185b640139ed544f128a3bb19 100644
--- a/panikdb/aa/admin.py
+++ b/panikdb/aa/admin.py
@@ -1,8 +1,20 @@
 from django.contrib import admin
+import django.contrib.auth.admin
+from django.utils.translation import ugettext, ugettext_lazy as _
 
 from .models import User
+from .forms import UserChangeForm
+
+class UserAdmin(django.contrib.auth.admin.UserAdmin):
+    form = UserChangeForm
+    fieldsets = (
+        (None, {'fields': ('username', 'password')}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name', 'email',
+                'emissions', 'news_categories')}),
+        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
+                                       'groups', 'user_permissions')}),
+        (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
+    )
 
-class UserAdmin(admin.ModelAdmin):
-    pass
 
 admin.site.register(User, UserAdmin)
diff --git a/panikdb/aa/forms.py b/panikdb/aa/forms.py
new file mode 100644
index 0000000000000000000000000000000000000000..a7b2957399d60354b56dedfa9156580772950d5e
--- /dev/null
+++ b/panikdb/aa/forms.py
@@ -0,0 +1,9 @@
+import django.contrib.auth.forms
+
+from .models import User
+
+class UserChangeForm(django.contrib.auth.forms.UserChangeForm):
+
+    class Meta:
+        model = User
+