diff --git a/pgweb/contributors/admin.py b/pgweb/contributors/admin.py
index 30cad569..3d0675c8 100644
--- a/pgweb/contributors/admin.py
+++ b/pgweb/contributors/admin.py
@@ -15,6 +15,7 @@ class ContributorAdminForm(forms.ModelForm):
 
 class ContributorAdmin(admin.ModelAdmin):
     form = ContributorAdminForm
+    autocomplete_fields = ['user', ]
 
 
 admin.site.register(ContributorType)
diff --git a/pgweb/core/admin.py b/pgweb/core/admin.py
index 2b32f77e..99e397e3 100644
--- a/pgweb/core/admin.py
+++ b/pgweb/core/admin.py
@@ -21,6 +21,7 @@ class OrganisationAdmin(admin.ModelAdmin):
     list_filter = ('approved',)
     ordering = ('name', )
     search_fields = ('name', )
+    autocomplete_fields = ['managers', ]
 
 
 class VersionAdmin(admin.ModelAdmin):