diff --git a/src/routes/onboarding/index.js b/src/routes/onboarding/index.js
index 7ccd131a..1075636c 100644
--- a/src/routes/onboarding/index.js
+++ b/src/routes/onboarding/index.js
@@ -4,7 +4,7 @@ import { Helmet } from "react-helmet";
 import WelcomeStep from "./steps/1-welcome";
 import ServerNameStep from "./steps/2-serverName";
 import AdminCredentialsStep from "./steps/3-adminCredentials";
-import InviteRuleStep from "./steps/4-inviteRule";
+import WhoCanInviteStep from "./steps/4-whoCanInvite";
 import InviteLinkStep from "./steps/5-inviteLink";
 import CompletedStep from "./steps/6-completed";
 import StyledOnboardingPage from "./styled";
@@ -25,7 +25,7 @@ export default function OnboardingPage() {
         {step === 0 && <WelcomeStep {...props} />}
         {step === 1 && <ServerNameStep {...props} />}
         {step === 2 && <AdminCredentialsStep {...props} />}
-        {step === 3 && <InviteRuleStep {...props} />}
+        {step === 3 && <WhoCanInviteStep {...props} />}
         {step === 4 && <InviteLinkStep {...props} />}
         {step === 5 && <CompletedStep {...props} />}
         {step === 6 && <Navigate replace to="/" />}
diff --git a/src/routes/onboarding/steps/4-inviteRule.js b/src/routes/onboarding/steps/4-whoCanInvite.js
similarity index 73%
rename from src/routes/onboarding/steps/4-inviteRule.js
rename to src/routes/onboarding/steps/4-whoCanInvite.js
index 33cdae9f..22acdc96 100644
--- a/src/routes/onboarding/steps/4-inviteRule.js
+++ b/src/routes/onboarding/steps/4-whoCanInvite.js
@@ -5,28 +5,28 @@ import StyledRadio from "../../../common/component/styled/Radio";
 import StyledButton from "../../../common/component/styled/Button";
 import { useGetLoginConfigQuery, useUpdateLoginConfigMutation } from "../../../app/services/server";
 
-const StyledInviteRuleStep = styled.div`
+const StyledWhoCanSignUpStep = styled.div`
   height: 100%;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
 
-  > .input:not(:nth-last-child(2)) {
-    margin-bottom: 20px;
+  > form {
+    width: 512px;
   }
 `;
 
-export default function InviteRuleStep({ setStep }) {
+export default function WhoCanInviteStep({ setStep }) {
   const { data: loginConfig } = useGetLoginConfigQuery();
   const [updateLoginConfig, { isSuccess, error }] = useUpdateLoginConfigMutation();
 
-  const [value, setValue] = useState(0);
+  const [value, setValue] = useState("EveryOne");
 
   // Display error
   useEffect(() => {
     if (error === undefined) return;
-    toast.error(`Failed to update invitation rule: ${error.data}`);
+    toast.error(`Failed to update sign up rule: ${error.data}`);
   }, [error]);
 
   // Increment `step` when updating has completed
@@ -35,19 +35,19 @@ export default function InviteRuleStep({ setStep }) {
   }, [isSuccess]);
 
   return (
-    <StyledInviteRuleStep>
+    <StyledWhoCanSignUpStep>
       <span className="primaryText">Last step: invite others!</span>
       <span className="secondaryText">Firstly, who can sign up to this server?</span>
       <StyledRadio
         options={["Everyone", "Invitation link only"]}
+        values={["EveryOne", "InvitationOnly"]}
         value={value}
-        onChange={async (v) => {
+        onChange={(v) => {
           setValue(v);
           if (loginConfig !== undefined) {
-            const whoCanSignUp = ["EveryOne", "InvitationOnly"][v];
-            await updateLoginConfig({
+            updateLoginConfig({
               ...loginConfig,
-              who_can_sign_up: whoCanSignUp
+              who_can_sign_up: v
             });
           }
         }}
@@ -58,6 +58,6 @@ export default function InviteRuleStep({ setStep }) {
       >
         Skip
       </StyledButton>
-    </StyledInviteRuleStep>
+    </StyledWhoCanSignUpStep>
   );
 }