diff --git a/djangobb_forum/templates/djangobb_forum/forum.html b/djangobb_forum/templates/djangobb_forum/forum.html
index bb5290a..371515b 100644
--- a/djangobb_forum/templates/djangobb_forum/forum.html
+++ b/djangobb_forum/templates/djangobb_forum/forum.html
@@ -53,7 +53,7 @@
                                             {% trans "Sticky:" %}
                                         {% endif %}
                                         <h3 {% if not topic|has_unreads:user %}class="topic_isread"{% endif %}>{% link topic %}</h3>
-                      <span class="byuser">{% trans "by" %} {{ topic.user.username }}</span>
+                                        <span class="byuser">{% trans "by" %} {{ topic.user.username }}</span>
                                         {% if topic|has_unreads:user %}<a href="{{ topic|forum_unread_link:user }}">{% trans "(New Posts)" %}</a>{% endif %}
                                     </div>
                                 </div>
diff --git a/djangobb_forum/views.py b/djangobb_forum/views.py
index 7f814e5..e4d3a31 100644
--- a/djangobb_forum/views.py
+++ b/djangobb_forum/views.py
@@ -353,7 +353,7 @@ def show_forum(request, forum_id, full=True):
     forum = get_object_or_404(Forum, pk=forum_id)
     if not forum.category.has_access(request.user):
         return HttpResponseForbidden()
-    topics = forum.topics.order_by('-sticky', '-updated').select_related()
+    topics = forum.topics.order_by('-sticky', '-updated').select_related('last_post__user', 'user')
     moderator = request.user.is_superuser or\
         request.user in forum.moderators.all()
     to_return = {'categories': Category.objects.all(),