diff --git a/packages/component-wizard/src/components/StepTwo.js b/packages/component-wizard/src/components/StepTwo.js
index 519712e13660a4b9acd0cb05108c334a1a605a2f..96e4e033e46a8eed6fb3b6cbdd4ffce4b3de8046 100644
--- a/packages/component-wizard/src/components/StepTwo.js
+++ b/packages/component-wizard/src/components/StepTwo.js
@@ -22,7 +22,6 @@ const StepTwo = ({
   addAuthor,
   changeForm,
   formValues,
-  hasConflicts,
   authorsError,
   manuscriptTypes,
   ...rest
diff --git a/packages/component-wizard/src/components/SubmissionWizard.js b/packages/component-wizard/src/components/SubmissionWizard.js
index a2379d079b4ecc5a46db9cdb9bd90226c7685e1f..d3b6de029b96c553ddf044c55f3083837b5fa429 100644
--- a/packages/component-wizard/src/components/SubmissionWizard.js
+++ b/packages/component-wizard/src/components/SubmissionWizard.js
@@ -130,7 +130,7 @@ export default compose(
     },
   ),
   withStateHandlers(
-    { step: 1 },
+    { step: 0 },
     {
       nextStep: ({ step }) => () => ({
         step: Math.min(wizardSteps.length - 1, step + 1),
@@ -155,7 +155,6 @@ export default compose(
       authorsError:
         (submitFailed && get(formSyncErrors, 'authors', '')) ||
         reduxAuthorError,
-      hasConflicts: get(formValues, 'conflicts.hasConflicts', 'no') === 'yes',
     }),
   ),
   withHandlers({
diff --git a/packages/component-wizard/src/components/utils.js b/packages/component-wizard/src/components/utils.js
index 86d2812f64862577dc7fad223fe656815e4fff40..8a222fc6e6647c3fcc8ab5c7617e817efe59d10d 100644
--- a/packages/component-wizard/src/components/utils.js
+++ b/packages/component-wizard/src/components/utils.js
@@ -20,7 +20,11 @@ export const setInitialValues = ({ version }) => ({
     files: get(version, 'files', {}),
     authors: get(version, 'authors', []),
     metadata: get(version, 'metadata', {}),
-    conflicts: get(version, 'conflicts', { hasConflicts: 'no' }),
+    conflicts: get(version, 'conflicts', {
+      hasConflicts: 'no',
+      hasDataAvailability: 'yes',
+      hasFunding: 'yes',
+    }),
     declarations: get(version, 'declarations', { agree: false }),
   },
 })