diff --git a/src/shared/components/home/setup.tsx b/src/shared/components/home/setup.tsx
index 8da196ca..943e74a1 100644
--- a/src/shared/components/home/setup.tsx
+++ b/src/shared/components/home/setup.tsx
@@ -209,6 +209,9 @@ export class Setup extends Component<any, State> {
       let data = wsJsonToRes<LoginResponse>(msg, LoginResponse);
       this.setState({ userLoading: false });
       UserService.Instance.login(data);
+      if (UserService.Instance.jwtInfo.isSome()) {
+        this.setState({ doneRegisteringUser: true });
+      }
     } else if (op == UserOperation.CreateSite) {
       window.location.href = "/";
     }