Index: webapp/cms/WEB-INF/param/workflow.xml
===================================================================
--- webapp/cms/WEB-INF/param/workflow.xml	(revision 18348)
+++ webapp/cms/WEB-INF/param/workflow.xml	(working copy)
@@ -35,6 +35,9 @@
 				<function type="avalon">
 					<arg name="role">org.ametys.cms.workflow.SetCurrentStepFunction</arg>
 				</function>
+				<function type="avalon">
+					<arg name="role">org.ametys.cms.workflow.CreateVersionFunction</arg>
+				</function>
 			</post-functions>
 		</action>
 	</initial-actions>
@@ -94,6 +97,12 @@
                 <function type="avalon">
                     <arg name="role">org.ametys.plugins.forms.workflow.FormEditionFunction</arg>
                 </function>
+				<function type="avalon">
+					<arg name="role">org.ametys.cms.workflow.SetCurrentStepFunction</arg>
+				</function>
+				<function type="avalon">
+					<arg name="role">org.ametys.cms.workflow.CreateVersionFunction</arg>
+				</function>
             </post-functions>
         </action>
 		<action id="4" name="plugin.web:WORKFLOW_ACTION_VALIDATE">
@@ -111,11 +120,6 @@
                     </condition>
 				</conditions>
 			</restrict-to>
-			<pre-functions>
-				<function type="avalon">
-					<arg name="role">org.ametys.web.workflow.ValidateContentFunction</arg>
-				</function>
-			</pre-functions>
 			<results>
 				<unconditional-result old-status=" " status=" " step="3" />
 			</results>
@@ -123,6 +127,18 @@
                 <function type="avalon">
                     <arg name="role">org.ametys.plugins.translationflagging.TranslationAlertFunction</arg>
                 </function>
+                <function type="avalon">
+					<arg name="role">org.ametys.web.workflow.ValidateContentFunction</arg>
+				</function>
+                <function type="avalon">
+					<arg name="role">org.ametys.cms.workflow.SetCurrentStepFunction</arg>
+				</function>
+				<function type="avalon">
+					<arg name="role">org.ametys.cms.workflow.CreateVersionFunction</arg>
+				</function>
+				<function type="avalon">
+					<arg name="role">org.ametys.web.workflow.AddLiveLabelFunction</arg>
+				</function>
             </post-functions>
 		</action>
 		<action id="6" name="plugin.web:WORKFLOW_ACTION_RESTORE">
@@ -145,6 +161,11 @@
 			<results>
 				<unconditional-result old-status=" " status=" " step="1" />
 			</results>
+			<post-functions>
+				<function type="avalon">
+					<arg name="role">org.ametys.cms.workflow.SetCurrentStepFunction</arg>
+				</function>
+			</post-functions>
 		</action>
         <action id="8" name="plugin.web:WORKFLOW_ACTION_ARCHIVE">
             <restrict-to>
@@ -169,6 +190,11 @@
             <results>
                 <unconditional-result old-status=" " status=" " step="9999" />
             </results>
+            <post-functions>
+				<function type="avalon">
+					<arg name="role">org.ametys.cms.workflow.SetCurrentStepFunction</arg>
+				</function>
+			</post-functions>
         </action>
         <action id="10" name="plugin.web:WORKFLOW_ACTION_UNPUBLISH">
 			<restrict-to>