If password is not found, '/' is returned.

packages/app/src/components/CompleteUserRegistrationForm.tsx

@@ -67,9 +67,9 @@ const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
 
       setIsSuccessToRagistration(true);
 
-      if (registrationMode !== RegistrationMode.RESTRICTED) {
-        const { redirectTo } = res.data;
-        router.push(redirectTo ?? '/');
+      const { redirectTo } = res.data;
+      if (redirectTo != null) {
+        router.push(redirectTo);
       }
     }
     catch (err) {
@@ -77,7 +77,7 @@ const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
       setDisableForm(false);
       setIsSuccessToRagistration(false);
     }
-  }, [username, name, password, token, registrationMode, router]);
+  }, [username, name, password, token, router]);
 
   if (isSuccessToRagistration && registrationMode === RegistrationMode.RESTRICTED) {
     return <CompleteUserRegistration />;

packages/app/src/server/routes/apiv3/user-activation.ts

@@ -169,9 +169,7 @@ export const completeRegistrationAction = (crowi) => {
 
           // userData.password cann't be empty but, prepare redirect because password property in User Model is optional
           // https://github.com/weseek/growi/pull/6670
-          const redirectTo = userData.password ? req.session.redirectTo : '/me#password';
-
-          delete req.session.redirectTo;
+          const redirectTo = userData.password != null ? '/' : '/me#password';
           return res.apiv3({ redirectTo });
         });
       });