diff --git a/pyweb/mumble/templates/mumble/list.html b/pyweb/mumble/templates/mumble/list.html
index ada538a..b82bd74 100644
--- a/pyweb/mumble/templates/mumble/list.html
+++ b/pyweb/mumble/templates/mumble/list.html
@@ -2,6 +2,7 @@
 {% comment %}
   <!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
 {% endcomment %}
+{% load i18n %}
 {% load mumble_extras %}
 {% block Headline %}
 Configured Mumble Servers
@@ -15,6 +16,8 @@ Configured Mumble Servers
     {% else %}
       <li>{{ mumble.name }} (offline)</li>
     {% endif %}
+  {% empty %}
+    {% trans "No server instances have been configured yet." %}
   {% endfor %}
   </ul>
 </div>
diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py
index 3122bcc..467e974 100644
--- a/pyweb/mumble/views.py
+++ b/pyweb/mumble/views.py
@@ -64,7 +64,7 @@ def mobile_mumbles( request ):
 
 def mumbles( request, mobile=False ):
 	""" Display a list of all configured Mumble servers, or redirect if only one configured. """
-	mms = get_list_or_404( Mumble );
+	mms = Mumble.objects.all().order_by( "name" );
 	
 	if len(mms) == 1:
 		return HttpResponseRedirect( reverse(