diff --git a/core/templates/core/timer_detail.html b/core/templates/core/timer_detail.html
index bf64e559..f37f54d2 100644
--- a/core/templates/core/timer_detail.html
+++ b/core/templates/core/timer_detail.html
@@ -11,12 +11,15 @@
             <span class="timer-minutes">{{ object.current_duration|minutes }}</span>m
             <span class="timer-seconds">{{ object.current_duration|seconds }}</span>s
         </h1>
-        <p class="lead text-muted">
+        <p class="lead text-secondary">
             Started {{ object.start }}
             {% if not object.active %}
                 / Stopped {{ object.end }}
             {% endif %}
         </p>
+        <p class="text-muted">
+            Created by {{ object.user }}
+        </p>
 
         {% if perms.core.add_feeding %}
             <a class="btn btn-success btn-lg btn-block p-3 mb-3"
diff --git a/core/templates/core/timer_nav.html b/core/templates/core/timer_nav.html
index f00f6dc0..12e1d5ea 100644
--- a/core/templates/core/timer_nav.html
+++ b/core/templates/core/timer_nav.html
@@ -19,10 +19,12 @@
                 <i class="fa fa-list" aria-hidden="true"></i> View Timers
             </a>
         {% endif %}
+        <div class="dropdown-divider"></div>
+        <h6 class="dropdown-header">Active Timers</h6>
         {% for timer in timers %}
-            <div class="dropdown-divider"></div>
-            <h6 class="dropdown-header">Active Timers</h6>
-            <a class="dropdown-item" href="{% url 'timer-detail' timer.id %}">{{ timer }}</a>
+            <a class="dropdown-item" href="{% url 'timer-detail' timer.id %}">{{ timer }} ({{ timer.user }})</a>
+        {% empty %}
+            None
         {% endfor %}
     </div>
 </li>
\ No newline at end of file
diff --git a/core/templatetags/timers.py b/core/templatetags/timers.py
index 9d4fd24e..80810a2e 100644
--- a/core/templatetags/timers.py
+++ b/core/templatetags/timers.py
@@ -12,7 +12,7 @@ register = template.Library()
 @register.inclusion_tag('core/timer_nav.html', takes_context=True)
 def timer_nav(context, active=True):
     request = context['request'] or None
-    timers = Timer.objects.filter(user=request.user, active=active)
+    timers = Timer.objects.filter(active=active)
     perms = context['perms'] or None
     # The 'next' parameter is currently not used.
     return {'timers': timers, 'perms': perms, 'next': request.path}