diff --git a/marietje/queues/admin.py b/marietje/queues/admin.py
index c971c4f..047c7e4 100644
--- a/marietje/queues/admin.py
+++ b/marietje/queues/admin.py
@@ -12,8 +12,10 @@ class OrderAdmin(admin.ModelAdmin):
 @admin.register(PlaylistSong)
 class PlaylistSongAdmin(admin.ModelAdmin):
     list_display = ('playlist', 'song', 'user', 'state', 'played_at')
+    list_display_links = ('song',)
     list_filter = ('playlist', 'state', 'user')
     search_fields = ('song__title', 'song__artist', 'user__name')
+    autocomplete_fields = ('user',)
     readonly_fields = ('song',)
 
 
diff --git a/marietje/songs/admin.py b/marietje/songs/admin.py
index 86beb11..a75dfd1 100644
--- a/marietje/songs/admin.py
+++ b/marietje/songs/admin.py
@@ -14,6 +14,7 @@ class SongAdmin(admin.ModelAdmin):
     list_display = ('artist', 'title', 'user_name', 'reports')
     search_fields = ('artist', 'title', 'user__name')
     inlines = [ReportNoteInline]
+    autocomplete_fields = ('user',)
 
     @staticmethod
     def reports(song):
@@ -35,6 +36,7 @@ class ReportNoteAdmin(admin.ModelAdmin):
     exclude = ('song',)
     list_display = ('song', 'note', 'user')
     search_fields = ('song__artist', 'song__title', 'user__name')
+    autocomplete_fields = ('user',)
     readonly_fields = ('song_link',)
 
     @staticmethod