diff --git a/website/src/middleware.ts b/website/src/middleware.ts
index 31c2cb4e..8e48d3b7 100644
--- a/website/src/middleware.ts
+++ b/website/src/middleware.ts
@@ -4,5 +4,5 @@ export { default } from "next-auth/middleware";
  * Guards all pages under `/grading` and redirects them to the sign in page.
  */
 export const config = {
-  matcher: ["/create/:path*", "/evaluate/:path*", "/grading/:path*", "/account/:path*", "/summarize/:path*"],
+  matcher: ["/create/:path*", "/evaluate/:path*", "/account/:path*"],
 };
diff --git a/website/src/pages/404.tsx b/website/src/pages/404.tsx
index 80eee036..76fb0b67 100644
--- a/website/src/pages/404.tsx
+++ b/website/src/pages/404.tsx
@@ -11,11 +11,9 @@ export default function Error() {
         <title>404 - Open Assistant</title>
         <meta name="404" content="Sorry, this page doesn't exist." />
       </Head>
-      <Header />
       <main className="flex h-3/4 items-center justify-center overflow-hidden subpixel-antialiased text-xl">
         <p>Sorry, the page you are looking for does not exist.</p>
       </main>
-      <Footer />
     </>
   );
 }
diff --git a/website/src/pages/_app.tsx b/website/src/pages/_app.tsx
index 7deebc4b..f602457f 100644
--- a/website/src/pages/_app.tsx
+++ b/website/src/pages/_app.tsx
@@ -40,7 +40,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppPropsWith
 
   return (
     <ChakraProvider theme={theme}>
-      <SessionProvider session={pageProps.session}>{page}</SessionProvider>
+      <SessionProvider session={session}>{page}</SessionProvider>
     </ChakraProvider>
   );
 }
diff --git a/website/src/pages/account/edit.tsx b/website/src/pages/account/edit.tsx
index 9142eb7e..d652ef8a 100644
--- a/website/src/pages/account/edit.tsx
+++ b/website/src/pages/account/edit.tsx
@@ -1,14 +1,8 @@
 import React, { useState } from "react";
-import { getSession, useSession } from "next-auth/react";
-import { PrismaClient, User } from "@prisma/client";
+import { useSession } from "next-auth/react";
 import { Button, Input, InputGroup, Stack } from "@chakra-ui/react";
 import Head from "next/head";
-import Link from "next/link";
 import Router from "next/router";
-import { Footer } from "src/components/Footer";
-import { Header } from "src/components/Header";
-
-import styles from "../styles/Home.module.css";
 
 export default function Account() {
   const { data: session } = useSession();
diff --git a/website/src/pages/account/index.tsx b/website/src/pages/account/index.tsx
index 112e3cc9..98bdc301 100644
--- a/website/src/pages/account/index.tsx
+++ b/website/src/pages/account/index.tsx
@@ -1,14 +1,8 @@
 import Head from "next/head";
 import Link from "next/link";
-import Router from "next/router";
-import React, { useEffect, useState } from "react";
-import { getSession, useSession } from "next-auth/react";
-import { Button, Input, InputGroup, Stack } from "@chakra-ui/react";
-import { Footer } from "../../components/Footer";
-import { Header } from "../../components/Header";
-
-import styles from "../styles/Home.module.css";
-import { getSystemErrorName } from "util";
+import React, { useState } from "react";
+import { useSession } from "next-auth/react";
+import { Button } from "@chakra-ui/react";
 
 export default function Account() {
   const { data: session } = useSession();
diff --git a/website/src/pages/api/username.tsx b/website/src/pages/api/username.tsx
index e2e41e25..a8aab7aa 100644
--- a/website/src/pages/api/username.tsx
+++ b/website/src/pages/api/username.tsx
@@ -12,7 +12,7 @@ export default async function handle(req, res) {
   const session = await getSession({ req });
   const result = await prisma.user.update({
     where: {
-      email: session?.user?.email,
+      email: session.user.email,
     },
     data: {
       name: username,