diff --git a/app/components/general-layout.tsx b/app/components/general-layout.tsx
index 7eeb351..c0b079b 100644
--- a/app/components/general-layout.tsx
+++ b/app/components/general-layout.tsx
@@ -14,7 +14,7 @@ import { useUppy } from "./lib/uppy";
 import type { UppyFile } from "@uppy/core";
 import { Progress } from "~/components/ui/progress";
 import { DialogClose } from "@radix-ui/react-dialog";
-import { ChevronDownIcon, TrashIcon } from "@radix-ui/react-icons";
+import { ChevronDownIcon, ExitIcon, TrashIcon } from "@radix-ui/react-icons";
 import {
   ClockIcon,
   DriveIcon,
@@ -25,12 +25,17 @@ import {
   PageIcon,
   ThemeIcon,
 } from "./icons";
-import { DropdownMenu, DropdownMenuTrigger } from "./ui/dropdown-menu";
+import { DropdownMenu, DropdownMenuTrigger,  DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem } from "./ui/dropdown-menu";
 import { Avatar } from "@radix-ui/react-avatar";
 import { cn } from "~/utils";
+import { useGetIdentity, useLogout } from "@refinedev/core";
+import { Identity } from "~/data/auth-provider";
+
 
 export const GeneralLayout = ({ children }: React.PropsWithChildren<{}>) => {
   const location = useLocation();
+  const { data: identity } = useGetIdentity<Identity>();
+  const{ mutate: logout } = useLogout()
   return (
     <div className="h-full flex flex-row">
       <header className="p-10 pr-0 flex flex-col w-[240px] h-full scroll-m-0 overflow-hidden">
@@ -95,10 +100,18 @@ export const GeneralLayout = ({ children }: React.PropsWithChildren<{}>) => {
             <DropdownMenuTrigger>
               <Button className="border rounded-full h-auto p-2 gap-x-2 text-ring font-semibold">
                 <Avatar className="bg-ring h-7 w-7 rounded-full" />
-                whirly10
+                {`${identity?.firstName} ${identity?.lastName}`}
                 <ChevronDownIcon />
               </Button>
             </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuGroup>
+                <DropdownMenuItem onClick={() => logout()}>
+                  <ExitIcon className="mr-2" />
+                  Log Out
+                </DropdownMenuItem>  
+              </DropdownMenuGroup>
+            </DropdownMenuContent>
           </DropdownMenu>
         </div>
 
diff --git a/app/components/upgrade-account-banner.tsx b/app/components/upgrade-account-banner.tsx
index 6474cf4..65d1577 100644
--- a/app/components/upgrade-account-banner.tsx
+++ b/app/components/upgrade-account-banner.tsx
@@ -1,3 +1,6 @@
+import { useGetIdentity } from "@refinedev/core"
+import { Identity } from "~/data/auth-provider"
+
 import {
   CrownIcon,
   PersonIcon,
@@ -10,13 +13,14 @@ import { Avatar } from "./ui/avatar"
 import { Button } from "./ui/button"
 
 export const UpgradeAccountBanner = () => {
+  const { data: identity } = useGetIdentity<Identity>();
   return (
     <div className="flex items-center justify-between p-8 border border-ring rounded-lg bg-secondary-1">
       <div className="flex items-center gap-x-4">
         <Avatar className="border-2 border-ring h-20 w-20" />
         <div>
           <div className="flex items-center gap-x-2 font-bold">
-            wirtly
+            {`${identity?.firstName} ${identity?.lastName}`}
             <CrownIcon className="text-ring" />
           </div>
           <div className="flex gap-x-5 mt-2">
diff --git a/app/routes/account.tsx b/app/routes/account.tsx
index de6250c..b8d32f7 100644
--- a/app/routes/account.tsx
+++ b/app/routes/account.tsx
@@ -1,5 +1,6 @@
 import { getFormProps, useForm } from "@conform-to/react";
 import { getZodConstraint, parseWithZod } from "@conform-to/zod";
+import { BaseKey, useGetIdentity, useUpdate, useUpdatePassword } from "@refinedev/core";
 import { useState } from "react";
 import { z } from "zod";
 import { Field } from "~/components/forms";
@@ -19,10 +20,7 @@ import { UsageCard } from "~/components/usage-card";
 import QRImg from "~/images/QR.png";
 
 export default function MyAccount() {
-  const isLogged = true;
-  if (!isLogged) {
-    window.location.href = "/login";
-  }
+  const { data: identity } = useGetIdentity<{ email: string }>();
 
   const [openModal, setModal] = useState({
     changeEmail: false,
@@ -53,7 +51,7 @@ export default function MyAccount() {
         <ManagementCard>
           <ManagementCardTitle>Email Address</ManagementCardTitle>
           <ManagementCardContent className="text-ring font-semibold">
-          bsimpson@springfield.oh.gov.com
+          {identity?.email}
           </ManagementCardContent>
           <ManagementCardFooter>
             <Button className="h-12 gap-x-2" onClick={() => setModal({ ...openModal, changeEmail: true })}>
@@ -154,7 +152,7 @@ export default function MyAccount() {
         setOpen={(value: boolean) =>
           setModal({ ...openModal, changeEmail: value })
         }
-        currentValue="bsimpson@springfield.oh.gov.com"
+        currentValue={identity?.email || ""}
       />
       <ChangePasswordForm
         open={openModal.changePassword}
@@ -176,6 +174,16 @@ const ChangeEmailSchema = z.object({
   email: z.string().email(),
   password: z.string(),
   retypePassword: z.string(),
+})
+.superRefine((data, ctx) => {
+  if (data.password !== data.retypePassword) {
+    return ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ["retypePassword"],
+      message: "Passwords do not match",
+    });
+  }
+  return true;
 });
 
 const ChangeEmailForm = ({
@@ -187,6 +195,8 @@ const ChangeEmailForm = ({
   setOpen: (value: boolean) => void;
   currentValue: string;
 }) => {
+  const{ data: identity } = useGetIdentity<{ id: BaseKey }>();
+  const { mutate: updateEmail } = useUpdate();
   const [form, fields] = useForm({
     id: "login",
     constraint: getZodConstraint(ChangeEmailSchema),
@@ -194,6 +204,19 @@ const ChangeEmailForm = ({
       return parseWithZod(formData, { schema: ChangeEmailSchema });
     },
     shouldValidate: "onSubmit",
+    onSubmit(e) {
+      e.preventDefault();
+
+      const data = Object.fromEntries(new FormData(e.currentTarget).entries());
+      console.log(identity);
+      updateEmail({
+        resource: 'users',
+        id: identity?.id || "",
+        values: {
+          email: data.email.toString()
+        }
+      })
+    }
   });
 
   return (
@@ -236,6 +259,16 @@ const ChangePasswordSchema = z.object({
   currentPassword: z.string().email(),
   newPassword: z.string(),
   retypePassword: z.string(),
+})
+.superRefine((data, ctx) => {
+  if (data.newPassword !== data.retypePassword) {
+    return ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ["retypePassword"],
+      message: "Passwords do not match",
+    });
+  }
+  return true;
 });
 
 const ChangePasswordForm = ({
@@ -245,6 +278,7 @@ const ChangePasswordForm = ({
   open: boolean;
   setOpen: (value: boolean) => void;
 }) => {
+  const { mutate: updatePassword } = useUpdatePassword<{ password: string }>();
   const [form, fields] = useForm({
     id: "login",
     constraint: getZodConstraint(ChangeEmailSchema),
@@ -252,6 +286,16 @@ const ChangePasswordForm = ({
       return parseWithZod(formData, { schema: ChangePasswordSchema });
     },
     shouldValidate: "onSubmit",
+    onSubmit(e) {
+      e.preventDefault();
+
+      const data = Object.fromEntries(new FormData(e.currentTarget).entries());
+      
+      updatePassword({
+        password: data.newPassword.toString()
+      });
+
+    },
   });
 
   return (
@@ -270,7 +314,7 @@ const ChangePasswordForm = ({
             />
             <Field
               inputProps={{ name: fields.newPassword.name, type: "password" }}
-              labelProps={{ children: "Password" }}
+              labelProps={{ children: "New Password" }}
               errors={fields.newPassword.errors}
             />
             <Field