diff --git a/chat/templates/chat/list.html b/chat/templates/chat/list.html
index c11afbb..0909dc3 100644
--- a/chat/templates/chat/list.html
+++ b/chat/templates/chat/list.html
@@ -26,10 +26,10 @@
         		<div class="panel panel-default">
         			<div class="panel-body">
     	    			<div class="col-md-8">
-                            <form action="" method="GET" class="form-horizontal">
+                            <form action="{% url 'chat:participants_general' %}" method="GET" class="form-horizontal">
                                 <div class="form-group">
                                     <div class="col-md-11 col-sm-11 col-xs-11">
-                                        <input type="text" class="form-control" name="search" placeholder="{% trans 'Search...' %}" />
+                                        <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
                                     </div>
                                     <div class="col-md-1 col-sm-1 col-xs-1">
                                         <button type="submit" class="btn btn-fab btn-fab-mini">
diff --git a/chat/templates/chat/list_participants.html b/chat/templates/chat/list_participants.html
index 89ce14e..5c5f183 100644
--- a/chat/templates/chat/list_participants.html
+++ b/chat/templates/chat/list_participants.html
@@ -28,10 +28,10 @@
         		<div class="panel panel-default">
         			<div class="panel-body">
     	    			<div class="col-md-8">
-                            <form action="" method="GET" class="form-horizontal">
+                            <form action="{% url 'chat:participants_general' %}" method="GET" class="form-horizontal">
                                 <div class="form-group">
                                     <div class="col-md-11 col-sm-11 col-xs-11">
-                                        <input type="text" class="form-control" name="search" placeholder="{% trans 'Search...' %}" />
+                                        <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
                                     </div>
                                     <div class="col-md-1 col-sm-1 col-xs-1">
                                         <button type="submit" class="btn btn-fab btn-fab-mini">
diff --git a/chat/views.py b/chat/views.py
index 3d5f449..1f380c5 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -60,8 +60,9 @@ class GeneralParticipants(LoginRequiredMixin, generic.ListView):
 
 	def get_queryset(self):
 		user = self.request.user
+		search = self.request.GET.get('search', '')
 
-		users = User.objects.all().exclude(id = user.id).order_by('social_name','username')
+		users = User.objects.filter(Q(username__icontains = search) | Q(last_name__icontains = search) | Q(social_name__icontains = search) | Q(email__icontains = search)).distinct().order_by('social_name','username').exclude(email = user.email)
 		
 		self.totals['general'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__generaltalk__isnull = False).count()
 		self.totals['category'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__categorytalk__isnull = False).count()
@@ -74,6 +75,7 @@ class GeneralParticipants(LoginRequiredMixin, generic.ListView):
 
 		context['title'] = _('Messages - Participants')
 		context['totals'] = self.totals
+		context['search'] = self.request.GET.get('search')
 		context['chat_menu_active'] = 'subjects_menu_active'
 		
 		return context
--
libgit2 0.21.2