diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
index d35aaecaf11f3e30bcfcc3304b12bdbd04065775..b4b80f8786e9d0464cf26dc84cddeba167b7e30c 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
@@ -24,9 +24,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Finalize configuration and get ready for installation process.\n
+We don\'t use ExpressConfiguration_displayDownload script, because it would create categories and default roles which we do not want here.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard_expression</string> </key>
+            <value> <string>python: True</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml
index 27c41b4847f3f57c1c7687d7857e8616f1b5d185..a59923f69dbf95802d497190d7b2ec4fbea7f9d2 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml
@@ -6,6 +6,23 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>comment</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>text</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -14,6 +31,12 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>comment</string> </key>
+            <value> <string>Omit enetring number of users.\n
+BEFORE for possible transitions was:  E\n
+nter Number of User</string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>Configure your organisation.</string> </value>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml
index d6371059b668f0828ca074dc44a64ca72dc90b64..cfe1fe5475c98458cddbb5966942f99fc75ca877 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml
@@ -28,6 +28,10 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>guard_expression</string> </key>
+            <value> <string>python: True</string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>18</string> </value>
@@ -42,7 +46,7 @@
         </item>
         <item>
             <key> <string>transition_form_id</string> </key>
-            <value> <string>BusinessConfiguration_viewConsultingConfigureOrganisationDialog</string> </value>
+            <value> <string>BusinessConfiguration_setupOrganisationForm</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml
index 6e086ee84591fe04a950d9f2e50659cbe60ad131..c992428c7625222ebe504906ad9a33bbc10140be 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml
@@ -6,6 +6,23 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>comment</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -14,6 +31,10 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>comment</string> </key>
+            <value> <string>Configure Roles</string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml
index 90820ab204ceb5898b46ab01877d705f05cf6b79..0ff6c7ac13904b45dc1b065836563bf12f4c3899 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml
@@ -6,6 +6,23 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>comment</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -14,6 +31,10 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>comment</string> </key>
+            <value> <string>Configure Preference</string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml
index 5c28cf79659e327a65bb1b8f123b7a4d93960883..28a5e4b5ba277c5e5dbf8b9f3466f2dbb11921a5 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml
@@ -6,6 +6,23 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>comment</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -14,6 +31,10 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>comment</string> </key>
+            <value> <string>Configure Preference</string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value>