diff --git a/progit/issues.py b/progit/issues.py
index b6b2b58..9c0a4b9 100644
--- a/progit/issues.py
+++ b/progit/issues.py
@@ -167,6 +167,7 @@ def view_issue(repo, issueid, username=None):
 
     status = progit.lib.get_issue_statuses(SESSION)
 
+    form_comment = progit.forms.AddIssueCommentForm()
     form = None
     if authenticated() and is_repo_admin(repo):
         form = progit.forms.UpdateIssueStatusForm(status=status)
@@ -198,6 +199,7 @@ def view_issue(repo, issueid, username=None):
         username=username,
         issue=issue,
         form=form,
+        form_comment=form_comment,
     )
 
 
diff --git a/progit/templates/issue.html b/progit/templates/issue.html
index 8f0c6c8..26e07b2 100644
--- a/progit/templates/issue.html
+++ b/progit/templates/issue.html
@@ -78,7 +78,7 @@
     <div>
       <textarea id="comment" name="comment" title="comment"></textarea>
     </div>
-  {{ form.csrf_token }}
+  {{ form_comment.csrf_token }}
   <input type="submit" class="submit positive button" value="Comment">
   </form>
 </section>