diff --git a/src/pretix/control/templates/pretixcontrol/users/index.html b/src/pretix/control/templates/pretixcontrol/users/index.html
index 85b9971d4..74d68de4a 100644
--- a/src/pretix/control/templates/pretixcontrol/users/index.html
+++ b/src/pretix/control/templates/pretixcontrol/users/index.html
@@ -54,7 +54,7 @@
                 <td><strong>
                     <a href="{% url "control:users.edit" id=u.pk %}">{{ u.email }}</a>
                 </strong></td>
-                <td>{{ u.fullname }}</td>
+                <td>{{ u.fullname|default_if_none:"" }}</td>
                 <td>{% if u.is_active %}<span class="fa fa-check-circle"></span>{% endif %}</td>
                 <td>{% if u.is_superuser %}<span class="fa fa-check-circle"></span>{% endif %}</td>
                 <td class="text-right">
diff --git a/src/pretix/control/views/users.py b/src/pretix/control/views/users.py
index a790a850f..85df389b2 100644
--- a/src/pretix/control/views/users.py
+++ b/src/pretix/control/views/users.py
@@ -21,6 +21,7 @@ from pretix.control.views.user import RecentAuthenticationRequiredMixin
 class UserListView(AdministratorPermissionRequiredMixin, ListView):
     template_name = 'pretixcontrol/users/index.html'
     context_object_name = 'users'
+    paginate_by = 30
 
     def get_queryset(self):
         qs = User.objects.all()