diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 2a6bc2f47..056bc66fc 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -240,7 +240,13 @@
                     {% for resv in reservations %}
                         <tr>
                             <td>{{ resv.unit_list }}</td>
-                            <td>{{ resv.tenant }}</td>
+                            <td>
+                                {% if resv.tenant %}
+                                    <a href="{{ resv.tenant.get_absolute_url }}">{{ resv.tenant }}</a>
+                                {% else %}
+                                    <span class="text-muted">None</span>
+                                {% endif %}
+                            </td>
                             <td>
                                 {{ resv.description }}<br />
                                 <small>{{ resv.user }} &middot; {{ resv.created }}</small>
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index e985ed8f9..d5eb7df98 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -102,7 +102,7 @@
                 </div>
                 <div class="col-md-4 text-center">
                     <h2><a href="{% url 'dcim:rackreservation_list' %}?tenant={{ tenant.slug }}" class="btn {% if stats.rackreservation_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rackreservation_count }}</a></h2>
-                    <p>Rack Reservations</p>
+                    <p>Rack reservations</p>
                 </div>
                 <div class="col-md-4 text-center">
                     <h2><a href="{% url 'dcim:device_list' %}?tenant={{ tenant.slug }}" class="btn {% if stats.device_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.device_count }}</a></h2>