diff --git a/templates/index.html b/templates/index.html
index d1b744e94..fe35eb7bc 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,7 +7,7 @@
     <h1>Welcome to Converse</h1>
     <ul>
       {% for thread in threads -%}
-        <li><a href="/thread/{{ thread.id }}">{{ thread.title }}</a> (posted at {{ thread.posted }})</li>
+        <li><a href="/thread/{{ thread.id }}">{{ thread.title }}</a> (posted at {{ thread.posted }} by {{ thread.author_name }})</li>
       {%- endfor %}
     </ul>
     <hr>
diff --git a/templates/thread.html b/templates/thread.html
index e26d4bcc6..83007d6ac 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -6,9 +6,9 @@
   <body>
     <h1>{{ thread.title }}</h1>
 
-    <p>{{ thread.body }}<br><i>Posted at {{ thread.posted }}</i></p>
+    <p>{{ thread.body }}<br><i>Posted at {{ thread.posted }} by {{ thread.author_name }}</i></p>
     {% for post in posts -%}
-    <li>{{ post.body }}<br><i>Posted at {{ post.posted }}</i></li>
+    <li>{{ post.body }}<br><i>Posted at {{ post.posted }} by {{ post.author_name }}</i></li>
     {%- endfor %}
 
     <hr>
