diff --git a/authentication/admin.py b/authentication/admin.py
index d547620125abb683135eac29f8d44fac235c965b..c8a87904363db72c43c5dd7df44dd5c8be1346a3 100644
--- a/authentication/admin.py
+++ b/authentication/admin.py
@@ -1,5 +1,53 @@
 from django.contrib import admin
-
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from .models import CustomUser
 
-admin.site.register(CustomUser)
+
+class UserAdmin(BaseUserAdmin):
+    # The fields to be used in displaying the User model.
+    # These override the definitions on the base UserAdmin
+    # that reference specific fields on auth.User.
+    list_display = ('email',)
+    fieldsets = (
+        (None, {'fields': (\
+            'name',
+            'email',
+            'password',
+            'groups',
+            'diet_profile',
+            'nutritionist',
+            'date_joined',
+            'is_staff',
+            'is_active',
+            'is_superuser',
+            'user_permissions',
+            'last_login'
+        )}),
+    )
+    # add_fieldsets is not a standard ModelAdmin attribute. UserAdmin
+    # overrides get_fieldsets to use this attribute when creating a user.
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': (\
+                'name',
+                'email',
+                'password1',
+                'password2',
+                'groups',
+                'diet_profile',
+                'nutritionist',
+                'date_joined',
+                'is_staff',
+                'is_active',
+                'is_superuser',
+                'user_permissions',
+                'last_login'
+            )}
+        ),
+    )
+    search_fields = ('email',)
+    ordering = ('email',)
+
+
+admin.site.register(CustomUser, UserAdmin)