diff --git a/website/package-lock.json b/website/package-lock.json
index 1fa3d14d..68ef2ba8 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -45,6 +45,7 @@
         "sharp": "^0.31.3",
         "swr": "^2.0.0",
         "tailwindcss": "^3.2.4",
+        "unique-username-generator": "^1.1.3",
         "use-debounce": "^9.0.2"
       },
       "devDependencies": {
@@ -35987,6 +35988,11 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "node_modules/unique-username-generator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/unique-username-generator/-/unique-username-generator-1.1.3.tgz",
+      "integrity": "sha512-TB6YdqPMKMpTSgxAzjZkKWtmpZPHvARoWreCKBpc1UrLFz/0C6Q96/qdjpLr9OXPCHk16sD1LHjTr3JDj7q2JA=="
+    },
     "node_modules/unist-builder": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
@@ -64596,6 +64602,11 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "unique-username-generator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/unique-username-generator/-/unique-username-generator-1.1.3.tgz",
+      "integrity": "sha512-TB6YdqPMKMpTSgxAzjZkKWtmpZPHvARoWreCKBpc1UrLFz/0C6Q96/qdjpLr9OXPCHk16sD1LHjTr3JDj7q2JA=="
+    },
     "unist-builder": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
diff --git a/website/package.json b/website/package.json
index 580d0be3..2e46d187 100644
--- a/website/package.json
+++ b/website/package.json
@@ -62,6 +62,7 @@
     "sharp": "^0.31.3",
     "swr": "^2.0.0",
     "tailwindcss": "^3.2.4",
+    "unique-username-generator": "^1.1.3",
     "use-debounce": "^9.0.2"
   },
   "devDependencies": {
diff --git a/website/src/lib/oasst_api_client.ts b/website/src/lib/oasst_api_client.ts
index fb11adec..d48a987c 100644
--- a/website/src/lib/oasst_api_client.ts
+++ b/website/src/lib/oasst_api_client.ts
@@ -113,7 +113,7 @@ export class OasstApiClient {
       type: taskType,
       user: {
         id: userToken.sub,
-        display_name: userToken.name || userToken.email,
+        display_name: userToken.name,
         auth_method: "local",
       },
     });
@@ -146,7 +146,7 @@ export class OasstApiClient {
       type: updateType,
       user: {
         id: userToken.sub,
-        display_name: userToken.name || userToken.email,
+        display_name: userToken.name,
         auth_method: "local",
       },
       task_id: taskId,
diff --git a/website/src/pages/api/auth/[...nextauth].ts b/website/src/pages/api/auth/[...nextauth].ts
index 691cbcba..c718ddce 100644
--- a/website/src/pages/api/auth/[...nextauth].ts
+++ b/website/src/pages/api/auth/[...nextauth].ts
@@ -7,6 +7,7 @@ import CredentialsProvider from "next-auth/providers/credentials";
 import DiscordProvider from "next-auth/providers/discord";
 import EmailProvider from "next-auth/providers/email";
 import prisma from "src/lib/prismadb";
+import { generateUsername } from "unique-username-generator";
 
 const providers: Provider[] = [];
 
@@ -97,10 +98,11 @@ export const authOptions: AuthOptions = {
      * This let's use forward the role to the session object.
      */
     async jwt({ token }) {
-      const { isNew, role } = await prisma.user.findUnique({
+      const { isNew, name, role } = await prisma.user.findUnique({
         where: { id: token.sub },
-        select: { role: true, isNew: true },
+        select: { name: true, role: true, isNew: true },
       });
+      token.name = name;
       token.role = role;
       token.isNew = isNew;
       return token;
@@ -110,7 +112,18 @@ export const authOptions: AuthOptions = {
     /**
      * Update the user's role after they have successfully signed in
      */
-    async signIn({ user, account }) {
+    async signIn({ user, account, isNewUser }) {
+      if (isNewUser && account.provider === "email") {
+        await prisma.user.update({
+          data: {
+            name: generateUsername(),
+          },
+          where: {
+            id: user.id,
+          },
+        });
+      }
+
       // Get the admin list for the user's auth type.
       const adminForAccountType = adminUserMap.get(account.provider);