diff --git a/src/pages/studentJoinClass/RequestPending.tsx b/src/pages/studentJoinClass/RequestPending.tsx
index 7946013..e501049 100644
--- a/src/pages/studentJoinClass/RequestPending.tsx
+++ b/src/pages/studentJoinClass/RequestPending.tsx
@@ -19,63 +19,61 @@ const RequestPending: FC<RequestPendingProps> = ({ user }) => {
 
   return handleResultState(
     useRetrieveSchoolQuery(user.requesting_to_join_class!.school),
-    school => {
-      return (
-        <>
-          <Typography variant="h5">Request pending</Typography>
-          <Typography>
-            Your request to join class {user.requesting_to_join_class!.id} in
-            the school or club {school.name} is still pending.
-          </Typography>
-          <Typography>
-            The teacher for that class must review and approve the request to
-            complete the process.
-          </Typography>
-          <Typography>
-            If successful, the teacher will then contact you with your new login
-            details.
-          </Typography>
-          <Typography>
-            <strong>Warning:</strong> once the teacher accepts you to their
-            class, that teacher and the school or club will manage your account.
-          </Typography>
-          <Typography>
-            You may cancel your request now, before the teacher makes their
-            decision.
-          </Typography>
-          <Stack direction="row" spacing={2}>
-            <LinkButton variant="outlined" to={paths.indy.dashboard._}>
-              Back
-            </LinkButton>
-            <Button
-              onClick={() => {
-                void updateUser({
-                  id: user.id,
-                  requesting_to_join_class: null,
-                })
-                  .unwrap()
-                  .then(() => {
-                    navigate(".", {
-                      state: {
-                        notifications: [
-                          {
-                            props: {
-                              children:
-                                "Your request to join a school has been revoked successfully.",
-                            },
+    school => (
+      <>
+        <Typography variant="h5">Request pending</Typography>
+        <Typography>
+          Your request to join class {user.requesting_to_join_class!.id} in the
+          school or club {school.name} is still pending.
+        </Typography>
+        <Typography>
+          The teacher for that class must review and approve the request to
+          complete the process.
+        </Typography>
+        <Typography>
+          If successful, the teacher will then contact you with your new login
+          details.
+        </Typography>
+        <Typography>
+          <strong>Warning:</strong> once the teacher accepts you to their class,
+          that teacher and the school or club will manage your account.
+        </Typography>
+        <Typography>
+          You may cancel your request now, before the teacher makes their
+          decision.
+        </Typography>
+        <Stack direction="row" spacing={2}>
+          <LinkButton variant="outlined" to={paths.indy.dashboard._}>
+            Back
+          </LinkButton>
+          <Button
+            onClick={() => {
+              void updateUser({
+                id: user.id,
+                requesting_to_join_class: null,
+              })
+                .unwrap()
+                .then(() => {
+                  navigate(".", {
+                    state: {
+                      notifications: [
+                        {
+                          props: {
+                            children:
+                              "Your request to join a school has been revoked successfully.",
                           },
-                        ],
-                      },
-                    })
+                        },
+                      ],
+                    },
                   })
-              }}
-            >
-              Cancel request
-            </Button>
-          </Stack>
-        </>
-      )
-    },
+                })
+            }}
+          >
+            Cancel request
+          </Button>
+        </Stack>
+      </>
+    ),
   )
 }
 
diff --git a/src/pages/studentJoinClass/StudentJoinClass.tsx b/src/pages/studentJoinClass/StudentJoinClass.tsx
index 38ebcf1..341994c 100644
--- a/src/pages/studentJoinClass/StudentJoinClass.tsx
+++ b/src/pages/studentJoinClass/StudentJoinClass.tsx
@@ -40,7 +40,12 @@ const _StudentJoinClass: FC<SessionMetadata> = ({ user_id }) => {
               If successful, the teacher will contact you with your new login
               details.
             </Typography>
-            <RequestToJoinClassForm indyUser={user} />
+            <RequestToJoinClassForm
+              indyUser={{
+                id: user.id,
+                requesting_to_join_class: user.requesting_to_join_class!.id,
+              }}
+            />
           </>
         )}
       </page.Section>