diff --git a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx
index be385e34e0b3..95a42af83413 100644
--- a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx
+++ b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx
@@ -201,7 +201,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle
 			saveWorkspaceData,
 			saveOrganizationData,
 			completeSetupWizard,
-			maxSteps: data.serverAlreadyRegistered ? 2 : 3,
+			maxSteps: data.serverAlreadyRegistered ? 2 : 4,
 		}),
 		[
 			setupWizardData,
diff --git a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
index 3a9c7fbd5772..f5be377d8223 100644
--- a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
@@ -10,6 +10,8 @@ const setIntervalTime = (interval?: number): number => (interval ? interval * 10
 const CloudAccountConfirmation = (): ReactElement => {
 	const {
 		registerServer,
+		currentStep,
+		maxSteps,
 		goToStep,
 		setupWizardData: { registrationData },
 		saveWorkspaceData,
@@ -43,6 +45,8 @@ const CloudAccountConfirmation = (): ReactElement => {
 
 	return (
 		<AwaitingConfirmationPage
+			currentStep={currentStep}
+			stepCount={maxSteps}
 			emailAddress={registrationData.cloudEmail}
 			securityCode={registrationData.user_code}
 			onResendEmailRequest={(): Promise<void> => registerServer({ email: registrationData.cloudEmail, resend: true })}
diff --git a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
index 6bc2e25259b6..d7421b79a308 100644
--- a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
@@ -11,7 +11,7 @@ const SERVER_OPTIONS = {
 };
 
 const RegisterServerStep = (): ReactElement => {
-	const { goToPreviousStep, currentStep, setSetupWizardData, registerServer, maxSteps, offline, completeSetupWizard } =
+	const { goToPreviousStep, currentStep, goToNextStep, setSetupWizardData, registerServer, maxSteps, offline, completeSetupWizard } =
 		useSetupWizardContext();
 	const [serverOption, setServerOption] = useState(SERVER_OPTIONS.REGISTERED);
 
@@ -24,6 +24,7 @@ const RegisterServerStep = (): ReactElement => {
 
 	const handleRegister: ComponentProps<typeof RegisterServerPage>['onSubmit'] = async (data) => {
 		if (data.registerType !== 'standalone') {
+			goToNextStep();
 			setSetupWizardData((prevState) => ({ ...prevState, serverData: data }));
 			await registerServer(data);
 		}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 849f00c11428..6847ba12688c 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -5854,10 +5854,8 @@
   "onboarding.component.form.action.registerNow": "Register now",
   "onboarding.component.form.action.confirm": "Confirm",
   "onboarding.component.form.termsAndConditions": "I agree with <1>Terms and Conditions</1> and <3>Privacy Policy</3>",
-  "onboarding.component.emailCodeFallback": "Didn’t receive email? <1>Resend</1> or <3>Change email</3>",
+  "onboarding.component.emailCodeFallback": "Didn’t receive email? <1>Resend</1> or <3>Change email</3>.",
   "onboarding.page.form.title": "Let's launch your workspace",
-  "onboarding.page.awaitingConfirmation.title": "Awaiting confirmation",
-  "onboarding.page.awaitingConfirmation.subtitle": "We have sent you an email to {{emailAddress}} with a confirmation link. Please verify that the security code below matches the one in the email.",
   "onboarding.page.emailConfirmed.title": "Email Confirmed!",
   "onboarding.page.emailConfirmed.subtitle": "You can return to your Rocket.Chat application – we have launched your workspace already.",
   "onboarding.page.checkYourEmail.title": "Check your email",
@@ -5893,6 +5891,9 @@
   "onboarding.form.adminInfoForm.fields.password.label": "Password",
   "onboarding.form.adminInfoForm.fields.password.placeholder": "Create password",
   "onboarding.form.adminInfoForm.fields.keepPosted.label": "Keep me posted about Rocket.Chat updates",
+  "onboarding.form.awaitConfirmationForm.title": "Awaiting confirmation",
+  "onboarding.form.awaitConfirmationForm.content.securityCode": "Security code",
+  "onboarding.form.awaitConfirmationForm.content.sentEmail": "Email sent to <1>{{email}}</1> with a confirmation link.Please verify that the security code below matches the one in the email.",
   "onboarding.form.organizationInfoForm.title": "Organization Info",
   "onboarding.form.organizationInfoForm.subtitle": "We need to know who you are.",
   "onboarding.form.organizationInfoForm.fields.organizationName.label": "Organization name",