diff --git a/core/search_indexes.py b/core/search_indexes.py
index 7bece290..b98dc67b 100644
--- a/core/search_indexes.py
+++ b/core/search_indexes.py
@@ -34,6 +34,7 @@ from forum.models import ForumMessage, ForumMessageMeta
 class UserIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
     auto = indexes.EdgeNgramField(use_template=True)
+    last_update = indexes.DateTimeField(model_attr="last_update")
 
     def get_model(self):
         return User
@@ -45,6 +46,9 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
     def get_updated_field(self):
         return "last_update"
 
+    def prepare_auto(self, obj):
+        return self.prepared_data["auto"].strip()[:245]
+
 
 class IndexSignalProcessor(signals.BaseSignalProcessor):
     def setup(self):
diff --git a/core/templates/search/indexes/core/user_auto.txt b/core/templates/search/indexes/core/user_auto.txt
index 4167b506..9966df06 100644
--- a/core/templates/search/indexes/core/user_auto.txt
+++ b/core/templates/search/indexes/core/user_auto.txt
@@ -1,3 +1,13 @@
-{{ object.first_name }}
-{{ object.last_name }}
-{{ object.nick_name }}
+{% load search_helpers %}
+
+{% with first=object.first_name|safe|slugify last=object.last_name|safe|slugify nick=object.nick_name|default_if_none:""|safe|slugify %}
+
+{{ first|replace:"|-| " }}
+{{ last|replace:"|-| " }}
+{{ nick|replace:"|-| " }}
+{% if first|count:"-" != 0 %}{{ first|cut:"-" }}{% endif %}
+{% if last|count:"-" != 0 %}{{ last|cut:"-" }}{% endif %}
+{% if nick|count:"-" != 0 %}{{ nick|cut:"-" }}{% endif %}
+{{ first|cut:"-" }}{{ last|cut:"-" }}
+
+{% endwith %}
diff --git a/core/templatetags/search_helpers.py b/core/templatetags/search_helpers.py
new file mode 100644
index 00000000..537ff357
--- /dev/null
+++ b/core/templatetags/search_helpers.py
@@ -0,0 +1,27 @@
+from django.template.exceptions import TemplateSyntaxError
+from django import template
+from django.template.defaultfilters import stringfilter
+
+register = template.Library()
+
+
+# arg should be of the form "|foo|bar" where the first character is the
+# separator between old and new in value.replace(old, new)
+@register.filter
+@stringfilter
+def replace(value, arg):
+    # s.replace('', '') == s so len(arg) == 2 is fine
+    if len(arg) < 2:
+        raise TemplateSyntaxError("badly formatted argument")
+
+    arg = arg.split(arg[0])
+
+    if len(arg) != 3:
+        raise TemplateSyntaxError("badly formatted argument")
+
+    return value.replace(arg[1], arg[2])
+
+
+@register.filter
+def count(value, arg):
+    return value.count(arg)
diff --git a/core/views/site.py b/core/views/site.py
index 468d3f32..9a6355a4 100644
--- a/core/views/site.py
+++ b/core/views/site.py
@@ -30,6 +30,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils import html
 from django.views.generic import ListView, TemplateView
 from django.conf import settings
+from django.utils.text import slugify
 
 import json
 
@@ -73,7 +74,18 @@ def notification(request, notif_id):
 
 def search_user(query, as_json=False):
     try:
-        res = SearchQuerySet().models(User).autocomplete(auto=html.escape(query))[:20]
+        # slugify turns everything into ascii and every whitespace into -
+        # it ends by removing duplicate - (so ' - ' will turn into '-')
+        # replace('-', ' ') because search is whitespace based
+        query = slugify(query).replace("-", " ")
+        # TODO: is this necessary?
+        query = html.escape(query)
+        res = (
+            SearchQuerySet()
+            .models(User)
+            .autocomplete(auto=query)
+            .order_by("-last_update")[:20]
+        )
         return [r.object for r in res]
     except TypeError:
         return []