diff --git a/frontend-next/src/app/api/onboard/route.js b/frontend-next/src/app/api/onboard/route.js
index 4c177a8..b1b3e45 100644
--- a/frontend-next/src/app/api/onboard/route.js
+++ b/frontend-next/src/app/api/onboard/route.js
@@ -2,9 +2,10 @@ import { NextResponse } from "next/server";
 // Lib Imports
 import { app } from "../firebase-config";
 import { getDatabase, ref, set as firebaseSet } from "firebase/database";
+import { cookies } from "next/headers";
 
 
-async function onboard(firstName, lastName, req) {
+async function onboard(onboardingJSON, req) {
   var session = req.cookies.get("session");
   //Call the authentication endpoint
   var res = await fetch(new URL("/api/login", req.url), {headers: {Cookie: `session=${session?.value}`}})
@@ -14,16 +15,24 @@ async function onboard(firstName, lastName, req) {
     return NextResponse.json({}, { status: 401 });
   }
   try {
+    var expiresIn = 20 * 60 * 1000; // 20 minutes
     var { uid, email } = await res.json()
+    onboardingJSON.email = email
+    onboardingJSON.uid = uid
+    onboardingJSON.defined = true
     var database = getDatabase(app)
-    await firebaseSet(ref(database, `users/${uid}`), {
-      firstName: firstName,
-      lastName: lastName,
-      email: email
-    });
+    await firebaseSet(ref(database, `users/${uid}`), onboardingJSON);
+    var userOptions = {
+      name: "user",
+      value: JSON.stringify(onboardingJSON),
+      maxAge: expiresIn, // 20 mins
+      httpOnly: true,
+      secure: true,
+    };
+    cookies().set(userOptions);
     return NextResponse.json({}, { status: 200 });
   } catch(error) {
-    return NextResponse.json({ error: "Internal Server Error" },{ status: 500 });
+    return NextResponse.json({ error: "Internal Server Error: "+error },{ status: 500 });
   }
 }
 
@@ -31,8 +40,8 @@ async function onboard(firstName, lastName, req) {
 // Handles POST requests (login requests)
 export async function POST(req, res) {
   try {
-    var { firstName, lastName } = await req?.json()
-    return await onboard(firstName, lastName, req);
+    var onboardingJSON = await req?.json()
+    return await onboard(onboardingJSON, req);
   } catch (error) {
     return NextResponse.json({ error: "Internal Server Error" },{ status: 500 });
   }
diff --git a/frontend-next/src/app/onboarding/page.js b/frontend-next/src/app/onboarding/page.js
index 1f3b195..4493279 100644
--- a/frontend-next/src/app/onboarding/page.js
+++ b/frontend-next/src/app/onboarding/page.js
@@ -31,6 +31,7 @@ function Onboarding() {
                         Welcome to ChatMaps! We are excited to have you join our community!<br/>First we just need a little bit of information from you to get started.
                     </div>
                     <form action="#" onSubmit={handleSubmit(Onboard)}>
+                            <input type="text" {...register("username")} placeholder="Display Name"/><br/>
                             <input type="text" {...register("firstName")} placeholder="First Name"/><br/>
                             <input type="text" {...register("lastName")} placeholder="Last Name"/><br/>
                             <button type="submit" className="bg-[#dee0e0] m-5">Save</button>
diff --git a/frontend-next/src/app/register/page.js b/frontend-next/src/app/register/page.js
index 0d0291f..cfdfffe 100644
--- a/frontend-next/src/app/register/page.js
+++ b/frontend-next/src/app/register/page.js
@@ -3,7 +3,6 @@ import { useRouter } from "next/navigation";
 import { useForm, Form } from "react-hook-form";
 import "../globals.css"
 import { useState } from "react";
-import { data } from "autoprefixer";
 
 function Register() {
     var { register, control, setError, handleSubmit, formState: { errors } } = useForm()