diff --git a/apps/groups/admin.py b/apps/groups/admin.py
index ea0d8010f..9d720e4ac 100644
--- a/apps/groups/admin.py
+++ b/apps/groups/admin.py
@@ -6,5 +6,6 @@
 class GroupAdmin(admin.ModelAdmin):
     list_display = ['name', 'steward', 'wiki', 'website', 'irc_channel']
     search_fields = ['name']
+    raw_id_fields = ['steward']
 
 admin.site.register(Group, GroupAdmin)
diff --git a/apps/users/admin.py b/apps/users/admin.py
index 4f7314151..3daa7892e 100644
--- a/apps/users/admin.py
+++ b/apps/users/admin.py
@@ -1,15 +1,17 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Group, User
 
 from models import UserProfile, UsernameBlacklist
 
 admin.site.unregister(User)
+admin.site.unregister(Group)
 
 
 class UserProfileInline(admin.StackedInline):
     """UserProfile Inline model for UserAdmin."""
     model = UserProfile
+    raw_id_fields = ['vouched_by']
 
 
 class UserAdmin(UserAdmin):