diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index d9dd2e7..0877448 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -138,9 +138,11 @@
       {% endif %}
       <div class="issue_action icon pull-xs-right p-b-1">
         <div class="btn-group" role="group" aria-label="Basic example">
-          <a class="reply btn btn-secondary btn-sm" data-toggle="tooltip" title="Reply to this comment - loose formating">
-            <span class="oi" data-glyph="share-boxed"></span>
-          </a>
+          {% if id != 0 and g.fas_user and comment.parent.status in [True, 'Open'] or repo_admin %}
+            <a class="reply btn btn-secondary btn-sm" data-toggle="tooltip" title="Reply to this comment - loose formating">
+              <span class="oi" data-glyph="share-boxed"></span>
+            </a>
+          {% endif %}
           {% if id != 0 and g.fas_user and (
               (comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username)
               or repo_admin) %}
@@ -176,10 +178,12 @@
   </section>
   <div class="issue_action icon pull-xs-right">
     <div class="btn-group" role="group">
-      <a class="btn btn-secondary btn-sm reply"
-        title="Reply to the initial comment - loose formatting">
-        <span class="oi" data-glyph="share-boxed"></span>
-      </a>
+      {% if repo_admin or g.fas_user %}
+        <a class="btn btn-secondary btn-sm reply"
+          title="Reply to the initial comment - loose formatting">
+          <span class="oi" data-glyph="share-boxed"></span>
+        </a>
+      {% endif %}
       {% if repo_admin or (
         g.fas_user and g.fas_user.username == comment.user.username) %}
       <a class="btn btn-primary btn-sm" href="{{