diff --git a/ckanext/harvest/templates_new/source/edit.html b/ckanext/harvest/templates_new/source/edit.html
index c5a62bc..d74489b 100644
--- a/ckanext/harvest/templates_new/source/edit.html
+++ b/ckanext/harvest/templates_new/source/edit.html
@@ -4,6 +4,8 @@
 
 {% block primary_content_inner %}
   <div class="module-content">
-    {% block form %}{{ c.form | safe }}{% endblock %}
+    {% block form %}
+      {{- h.snippet(form_snippet, c=c, **form_vars) -}}
+    {% endblock %}
   </div>
 {% endblock %}
diff --git a/ckanext/harvest/templates_new/source/new.html b/ckanext/harvest/templates_new/source/new.html
index f98e69c..eaeb0e1 100644
--- a/ckanext/harvest/templates_new/source/new.html
+++ b/ckanext/harvest/templates_new/source/new.html
@@ -13,7 +13,9 @@
 {% block primary_content %}
   <section class="module">
     <div class="module-content">
-      {% block form %}{{ c.form | safe }}{% endblock %}
+      {% block form %}
+        {{- h.snippet(form_snippet, c=c, **form_vars) -}}
+      {% endblock %}
     </div>
   </section>
 {% endblock %}