diff --git a/users/templates/list_users.html b/users/templates/list_users.html
index 36c8163..89a9a0a 100644
--- a/users/templates/list_users.html
+++ b/users/templates/list_users.html
@@ -61,6 +61,10 @@
         {% endfor %}
         {% pagination request paginator page_obj %}
     {% else %}
-        
+        <div class="row">
+            <div class="col-md-12 col-sm-12 col-xs-12">
+                <p>{% trans 'No users found' %}</p>
+            </div>
+        </div>
     {% endif %}
 {% endblock %}
diff --git a/users/views.py b/users/views.py
index c023f83..2b7978e 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1,4 +1,5 @@
 from django.shortcuts import get_object_or_404
+from django.db.models import Q
 from django.views import generic
 from django.contrib import messages
 from rolepermissions.mixins import HasRoleMixin
@@ -19,7 +20,13 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 	paginate_by = 10
 
 	def get_queryset(self):
-		users = User.objects.exclude(username = self.request.user.username)
+		search = self.request.GET.get('search', None)
+
+		if search is None:
+			users = User.objects.exclude(username = self.request.user.username)
+		else:
+			users = User.objects.filter(Q(username = search) | Q(name__icontains = search))
+
 		return users
 
 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
--
libgit2 0.21.2