diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html
--- a/ennstatus/templates/status/macros.html
+++ b/ennstatus/templates/status/macros.html
@@ -28,7 +28,7 @@
 {% endmacro %}
 
 {% macro create_name(name) %}
-  <a href="http://{{ name }}.enn.lu">{{ name }}</a>
+  <a href="http://{{ name|lower }}.enn.lu">{{ name }}</a>
 {% endmacro %}
 
 {% macro create_server_table(server_type, servers) %}
@@ -50,7 +50,11 @@
       {% for server in servers %}
         <tr>
           <td>{{ loop.index }}</td>
-          <td>{{ create_name(server['server_name']) }}</td>
+          {% if server_type in ('Exit', 'Relay') %}
+            <td>{{ create_name(server['server_name']) }}</td>
+          {% else %}
+            <td>{{ server['server_name'] }}</td>
+          {% endif %}
           {% if server_type in ('Exit', 'Relay') %}
             <td>{{ server['ip'] }}</td>
           {% endif %}