diff --git a/bikeshop_project/registration/admin.py b/bikeshop_project/registration/admin.py
index 388b91c..de2620a 100644
--- a/bikeshop_project/registration/admin.py
+++ b/bikeshop_project/registration/admin.py
@@ -1,6 +1,34 @@
 from django.contrib import admin
 from .models import Member
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.forms import UserChangeForm
+
+
+class MemberChangeForm(UserChangeForm):
+    class Meta(UserChangeForm.Meta):
+        model = Member
+
+class MemberAdmin(UserAdmin):
+    form = MemberChangeForm
+
+    fieldsets = fieldsets = (
+        (None, {'fields': ('email', 'password')}),
+        ('Personal info', {'fields': ('first_name', 'last_name')}),
+        ('Permissions', {'fields': ('is_active', 'is_superuser',
+                                       'groups', 'user_permissions')}),
+        ('Important dates', {'fields': ('last_login',)}),
+    )
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('email', 'password1', 'password2'),
+        }),
+    )
+    ordering = ('email',)
+    list_display = ('email', 'first_name', 'last_name')
+    list_filter = ('is_superuser', 'is_active', 'groups')
+    search_fields = ('email', 'first_name', 'last_name', 'email')
 
 
 # Register your models here.
-admin.site.register(Member)
\ No newline at end of file
+admin.site.register(Member, MemberAdmin)