diff --git a/po/plume.pot b/po/plume.pot
index 683ee161..64032f48 100644
--- a/po/plume.pot
+++ b/po/plume.pot
@@ -278,3 +278,6 @@ msgstr ""
 
 msgid "{{ data }} mentioned you."
 msgstr ""
+
+msgid "Your comment"
+msgstr ""
diff --git a/templates/posts/details.html.tera b/templates/posts/details.html.tera
index 097ff3a2..63a93f66 100644
--- a/templates/posts/details.html.tera
+++ b/templates/posts/details.html.tera
@@ -60,7 +60,16 @@
 
         <div class="comments">
             <h2>{{ "Comments" | _ }}</h2>
-            <a class="button" href="comment?">{{ "Comment" | _ }}</a>
+
+            {% if account %}
+                <form method="post" action="/~/{{ blog.actor_id }}/{{ post.slug }}/comment">
+                    <label for="content">{{ "Your comment" | _ }}</label>
+                    {# Ugly, but we don't have the choice if we don't want weird paddings #}
+                    <textarea id="content" name="content">{% filter trim %}{% if previous %}{% if previous.author.fqn != user_fqn %}@{{ previous.author.fqn }} {% endif %}{% for mention in previous.mentions %}{% if mention != user_fqn %}@{{ mention }} {% endif %}{% endfor %}{% endif %}{% endfilter %}</textarea>
+                    <input type="submit" value="{{ "Submit comment" | _ }}" />
+                </form>
+            {%  endif %}
+
             <div class="list">
                 {% for comment in comments %}
                     {% if comment.author.display_name %}