diff --git a/mayan/apps/common/templates/generic_form_subtemplate.html b/mayan/apps/common/templates/generic_form_subtemplate.html
index 86a90773e0..59d5474afd 100644
--- a/mayan/apps/common/templates/generic_form_subtemplate.html
+++ b/mayan/apps/common/templates/generic_form_subtemplate.html
@@ -23,6 +23,9 @@
     {% else %}
         <form name="{{ form.prefix }}" method="{{ submit_method|default:'post' }}" action="{{ form_action }}" class="form">
     {% endif %}
+
+        {{ wizard.management_form }}
+
         {% if step_field %}
             <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
         {% endif %}
diff --git a/mayan/apps/common/templates/generic_wizard.html b/mayan/apps/common/templates/generic_wizard.html
index dd11f251f7..916b93b491 100644
--- a/mayan/apps/common/templates/generic_wizard.html
+++ b/mayan/apps/common/templates/generic_wizard.html
@@ -1,20 +1,29 @@
 {% extends 'base.html' %}
 
 {% load i18n %}
+
 {% load styling %}
 
 {% add_classes_to_form form %}
 
 {% block content %}
+
+    {{ wizard.management_form }}
     {% with step_title as title %}
-    {% with previous_fields as hidden_fields %}
-        {% if form.management_form %}
+
+        {% if wizard.form.forms %}
+            {{ wizard.form.management_form }}
+
+            {% with wizard.form as form %}
             {% with 'true' as form_display_mode_table %}
                 {% include 'generic_form_subtemplate.html' %}
             {% endwith %}
+            {% endwith %}
         {% else %}
-            {% include 'generic_form_subtemplate.html' %}
+            {% with wizard.form as form %}
+                {% include 'generic_form_subtemplate.html' %}
+            {% endwith %}
         {% endif %}
     {% endwith %}
-    {% endwith %}
+
 {% endblock %}