diff --git a/photologue/admin.py b/photologue/admin.py
index e58d1c1..eae1eaa 100644
--- a/photologue/admin.py
+++ b/photologue/admin.py
@@ -19,7 +19,7 @@ class PhotoAdmin(admin.ModelAdmin):
                     'is_public', 'view_count', 'admin_thumbnail', 'get_owner')
     list_filter = ['date_added', 'is_public', 'owner']
     search_fields = ['title', 'slug', 'caption']
-    list_per_page = 10
+    list_per_page = 25
     prepopulated_fields = {'slug': ('title',)}
     readonly_fields = ('date_taken',)
     model = Photo
@@ -33,6 +33,7 @@ class PhotoAdmin(admin.ModelAdmin):
 class TagAdmin(admin.ModelAdmin):
     list_display = ('name',)
     search_fields = ('name',)
+    prepopulated_fields = {'slug': ('name',)}
     model = Tag