diff --git a/opentech/apply/activity/templates/activity/include/comment_form.html b/opentech/apply/activity/templates/activity/include/comment_form.html
index 39cd0da890468dd32813e2ff65718601d51057cc..7ee2a49114e582d0f4d9a1c8fecd0d24dd49c0fc 100644
--- a/opentech/apply/activity/templates/activity/include/comment_form.html
+++ b/opentech/apply/activity/templates/activity/include/comment_form.html
@@ -1,8 +1,4 @@
 <h4>Add communication</h4>
 <div class="wrapper wrapper--comments">
-    <form class="form form--comments" method="post" id="comment-form">
-        {% csrf_token %}
-        {{ comment_form }}
-        <button id="comment-form-submit" name="form-submitted" form="comment-form" class="button button--primary" type="submit" value="comment">Add message</button>
-    </form>
+    {% include 'funds/includes/delegated_form_base.html' with form=comment_form value='Comment' extra_classes='form__comments'%}
 </div>
diff --git a/opentech/apply/funds/templates/funds/includes/delegated_form_base.html b/opentech/apply/funds/templates/funds/includes/delegated_form_base.html
index ffb83700908a422a7351c5842838f56d3c92ed79..794d7fc93f08f054d0549c2f2ee6f484f1623b63 100644
--- a/opentech/apply/funds/templates/funds/includes/delegated_form_base.html
+++ b/opentech/apply/funds/templates/funds/includes/delegated_form_base.html
@@ -1,4 +1,4 @@
-<form class="form" method="post" id="{{ form.name }}">
+<form class="form {{extra_classes}}" method="post" id="{{ form.name }}">
     {% csrf_token %}
     <div class="form__item">
         {{ form }}