diff --git a/CHANGES.txt b/CHANGES.txt
index 75239b6..58bc093 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Changelog
 1.0b9 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Do not show two "login to add comments" buttons when there are no comments
+  yet. This fixes http://plone.org/products/plone.app.discussion/issues/12.
+  [timo]
 
 
 1.0b8 (2010-10-04)
diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 6225842..84dc12e 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -129,7 +129,7 @@
     </div>
 
     <div class="reply"
-         tal:condition="python:isDiscussionAllowed and (isAnon and not isAnonymousDiscussionAllowed)">
+         tal:condition="python:has_replies and (isAnon and not isAnonymousDiscussionAllowed)">
         <form tal:attributes="action view/login_action">
             <input class="standalone"
                    style="margin-bottom: 1.25em;"