diff --git a/lacommunaute/templates/forum_conversation/partials/topic_form.html b/lacommunaute/templates/forum_conversation/partials/topic_form.html
index ac40d25f0..004b5b051 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_form.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_form.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load widget_tweaks %}
 {% load forum_permission_tags %}
+{% load permission_tags %}
 <form method="post" action="." class="form" enctype="multipart/form-data" novalidate>
     {% csrf_token %}
     {% for error in post_form.non_field_errors %}
@@ -8,6 +9,7 @@
             <i class="icon-exclamation-sign"></i> {{ error }}
         </div>
     {% endfor %}
+    <input type="hidden" name="post_pk" value="{{ post.pk }}">
     {% include "partials/form_field.html" with field=post_form.subject %}
     {% include "partials/form_field.html" with field=post_form.content %}
     {% if post_form.username %}
@@ -98,6 +100,14 @@
                     <a href="{% url 'forum_conversation:post_delete' forum.slug forum.pk topic.slug topic.pk post.pk %}" aria-label="{% trans "Delete" %}" role="button" class="btn btn-outline-danger">{% trans "Delete" %}</a>
                 </div>
             {% endif %}
+            {% user_can_moderate_post request.user as user_can_moderate_post %}
+            {% if user_can_moderate_post %}
+                <div class="form-group col-auto" id="moderate">
+                    <button type="submit" formaction="{% url 'forum_conversation_extension:post_moderate' forum.slug forum.pk topic.slug topic.pk %}" class="btn btn-outline-warning">
+                        {% trans "Moderate" %}
+                    </button>
+                </div>
+            {% endif %}
         {% endif %}
     </div>
 </form>
diff --git a/lacommunaute/templates/forum_conversation/post_update.html b/lacommunaute/templates/forum_conversation/post_update.html
index f9512eb07..c7d057560 100644
--- a/lacommunaute/templates/forum_conversation/post_update.html
+++ b/lacommunaute/templates/forum_conversation/post_update.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load forum_conversation_tags %}
 {% load forum_permission_tags %}
+{% load permission_tags %}
 {% block sub_title %}
     {% trans "Edit post" %}
 {% endblock sub_title %}
@@ -20,6 +21,7 @@ <h3 class="m-0 h4 card-title">{% trans "Edit post" %}</h3>
                 <div class="card-body">
                     <form method="post" action="." class="form" enctype="multipart/form-data" novalidate>
                         {% csrf_token %}
+                        <input type="hidden" name="post_pk" value="{{ post.pk }}">
                         {% include "forum_conversation/partials/post_form.html" %}
                         <div class="form-actions form-row">
                             <div class="form-group col-auto">
@@ -31,6 +33,14 @@ <h3 class="m-0 h4 card-title">{% trans "Edit post" %}</h3>
                                     <a href="{% url 'forum_conversation:post_delete' forum.slug forum.pk topic.slug topic.pk post.pk %}" role="button" class="btn btn-outline-danger" value="{% trans "Delete" %}">{% trans "Delete" %}</a>
                                 </div>
                             {% endif %}
+                            {% user_can_moderate_post request.user as user_can_moderate_post %}
+                            {% if user_can_moderate_post %}
+                                <div class="form-group col-auto" id="moderate">
+                                    <button type="submit" formaction="{% url 'forum_conversation_extension:post_moderate' forum.slug forum.pk topic.slug topic.pk %}" class="btn btn-outline-warning">
+                                        {% trans "Moderate" %}
+                                    </button>
+                                </div>
+                            {% endif %}
                         </div>
                     </form>
                 </div>
diff --git a/lacommunaute/utils/templatetags/permission_tags.py b/lacommunaute/utils/templatetags/permission_tags.py
new file mode 100644
index 000000000..29e2e950b
--- /dev/null
+++ b/lacommunaute/utils/templatetags/permission_tags.py
@@ -0,0 +1,11 @@
+from django.template import Library
+
+from lacommunaute.forum_conversation.shortcuts import can_moderate_post
+
+
+register = Library()
+
+
+@register.simple_tag(takes_context=True)
+def user_can_moderate_post(context, user):
+    return can_moderate_post(user)