diff --git a/cookbook/admin.py b/cookbook/admin.py
index 4b0d1acd2..5b95687b7 100644
--- a/cookbook/admin.py
+++ b/cookbook/admin.py
@@ -48,7 +48,7 @@ admin.site.register(Space, SpaceAdmin)
 
 class UserSpaceAdmin(admin.ModelAdmin):
     list_display = ('user', 'space',)
-    search_fields = ('user', 'space',)
+    search_fields = ('user__username', 'space__name',)
 
 
 admin.site.register(UserSpace, UserSpaceAdmin)