diff --git a/src/newsreader/accounts/admin.py b/src/newsreader/accounts/admin.py
index e0b5eed..49390c7 100644
--- a/src/newsreader/accounts/admin.py
+++ b/src/newsreader/accounts/admin.py
@@ -1,11 +1,13 @@
 from django import forms
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin as DjangoUserAdmin
+from django.contrib.auth.forms import UserChangeForm
 from django.utils.translation import ugettext as _
 
 from newsreader.accounts.models import User
 
 
-class UserAdminForm(forms.ModelForm):
+class UserAdminForm(UserChangeForm):
     class Meta:
         widgets = {
             "email": forms.EmailInput(attrs={"size": "50"}),
@@ -14,7 +16,7 @@ class UserAdminForm(forms.ModelForm):
         }
 
 
-class UserAdmin(admin.ModelAdmin):
+class UserAdmin(DjangoUserAdmin):
     list_display = ("email", "last_name", "date_joined", "is_active")
     list_filter = ("is_active", "is_staff", "is_superuser")
     ordering = ("email",)
@@ -26,7 +28,7 @@ class UserAdmin(admin.ModelAdmin):
     fieldsets = (
         (
             _("User settings"),
-            {"fields": ("email", "first_name", "last_name", "is_active")},
+            {"fields": ("email", "password", "first_name", "last_name", "is_active")},
         ),
         (
             _("Reddit settings"),