diff --git a/euscanwww/euscan/views.py b/euscanwww/euscan/views.py
index 57fb115..d9d3bc0 100644
--- a/euscanwww/euscan/views.py
+++ b/euscanwww/euscan/views.py
@@ -60,7 +60,7 @@ def herd(request, herd):
 @render_to('euscan/maintainers.html')
 def maintainers(request):
     maintainers = Package.objects.filter(maintainers__isnull=False)
-    maintainers = maintainers.values('maintainers__id', 'maintainers__name')
+    maintainers = maintainers.values('maintainers__id', 'maintainers__name', 'maintainers__email')
     maintainers = maintainers.annotate(n_packaged=Sum('n_packaged'),
                                        n_overlay=Sum('n_overlay'),
                                        n_versions=Sum('n_versions'))
diff --git a/euscanwww/templates/euscan/maintainers.html b/euscanwww/templates/euscan/maintainers.html
index bf0171f..c84a5a3 100644
--- a/euscanwww/templates/euscan/maintainers.html
+++ b/euscanwww/templates/euscan/maintainers.html
@@ -20,7 +20,11 @@
   <tr>
     <td>
       <a href="{% url euscan.views.maintainer maintainer.maintainers__id %}">
+	{% if maintainer.maintainers__name != maintainer.maintainers__email %}
+	{{ maintainer.maintainers__name }} &lt;{{ maintainer.maintainers__email }}&gt;
+	{% else %}
 	{{ maintainer.maintainers__name }}
+	{% endif %}
       </a>
       {% package_bar maintainer %}
     </td>