diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 5bb4392..370c50f 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -1127,8 +1127,10 @@ function template_preprocess_forum_topic_list(&$variables) {
         $variables['topics'][$id]->title = l($topic->title, "node/$topic->nid");
         $variables['topics'][$id]->message = '';
       }
-      $topic->uid = $topic->last_comment_uid ? $topic->last_comment_uid : $topic->uid;
       $variables['topics'][$id]->created = theme('forum_submitted', array('topic' => $topic));
+      // Now we set the uid to correspond to the last comment so that username
+      // is used in the themed output.
+      $topic->uid = $topic->last_comment_uid ? $topic->last_comment_uid : $topic->uid;
       $variables['topics'][$id]->last_reply = theme('forum_submitted', array('topic' => isset($topic->last_reply) ? $topic->last_reply : NULL));
 
       $variables['topics'][$id]->new_text = '';