diff --git a/src/components/users/partials/wizard/NewUserWizard.tsx b/src/components/users/partials/wizard/NewUserWizard.tsx
index 0c64b00afd..0732a33191 100644
--- a/src/components/users/partials/wizard/NewUserWizard.tsx
+++ b/src/components/users/partials/wizard/NewUserWizard.tsx
@@ -83,12 +83,25 @@ const NewUserWizard = ({
 
 							{/* Navigation buttons and validation */}
 							<WizardNavigationButtons
-								isLast
-								formik={formik}
-								nextPage={() => formik.handleSubmit()}
-								previousPage={() => close()}
-								cancelTranslationString={"CANCEL"}
-							/>
+							isLast={tab === 1}
+							formik={formik}
+							nextPage={() => {
+							if (tab < 1) {
+							setTab(tab + 1);
+							} else {
+								formik.handleSubmit();
+								}
+						}}
+							previousPage={() => {
+							if (tab > 0) {
+							setTab(tab - 1);
+							} else {
+							close();
+					}
+			}}
+					cancelTranslationString={"CANCEL"}
+				/>
+
 						</>
 					);
 				}}