diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index bd0dfc233..b704975c0 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -86,7 +86,8 @@
                                     showDropdown = false;
                                     newOrgModal.set(true);
                                 }}>New organization</DropListItem>
-                            <DropListLink href="/console/$me">Your Account</DropListLink>
+                            <DropListLink href={`${base}/console/account`}
+                                >Your Account</DropListLink>
                         </ul>
                     </section>
                     <section class="drop-section">
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 98d62d6bf..0a2108b7e 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -13,6 +13,8 @@
     } from '$lib/stores/organization';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { base } from '$app/paths';
+    import { user } from '$lib/stores/user';
+    import { goto } from '$app/navigation';
 
     export let isOpen = false;
     export let showSideNavigation = false;
@@ -55,6 +57,11 @@
         }
     });
 
+    const logout = async () => {
+        await user.logout();
+        await goto(`${base}/login`);
+    };
+
     const onScroll = () => {
         if (!tabsList) {
             return;
@@ -159,6 +166,12 @@
                         <span class="text"> {$title}</span>
                     </h1>
                 {/if}
+                {#if $page.url.pathname.includes('/console/account')}
+                    <div class="u-margin-inline-start-auto">
+                        <Button secondary on:click={logout}>Logout</Button>
+                    </div>
+                {/if}
+
                 {#if $copyData?.value}
                     <Copy value={$copyData.value}>
                         <Pill button>
diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts
index fe9993066..12a84121b 100644
--- a/src/lib/stores/user.ts
+++ b/src/lib/stores/user.ts
@@ -10,6 +10,9 @@ function createUserStore() {
         set,
         fetchUser: async () => {
             set(await sdkForConsole.account.get());
+        },
+        logout: async () => {
+            await sdkForConsole.account.deleteSession('current');
         }
     };
 }
diff --git a/src/routes/console/$me.svelte b/src/routes/console/$me.svelte
deleted file mode 100644
index 732f4edb7..000000000
--- a/src/routes/console/$me.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-    import { goto } from '$app/navigation';
-    import { base } from '$app/paths';
-
-    import { Button } from '$lib/elements/forms';
-    import { app } from '$lib/stores/app';
-    import { sdkForConsole } from '$lib/stores/sdk';
-
-    const logout = async () => {
-        await sdkForConsole.account.deleteSession('current');
-        await goto(`${base}/login`);
-    };
-    const toggleTheme = () => {
-        $app.theme = $app.theme === 'light' ? 'dark' : 'light';
-    };
-</script>
-
-<h1>hey</h1>
-<Button on:click={toggleTheme}>toggle Theme</Button>
-<Button on:click={logout}>Logout</Button>
diff --git a/src/routes/console/__layout.svelte b/src/routes/console/__layout.svelte
index 19f720775..c1edbe0df 100644
--- a/src/routes/console/__layout.svelte
+++ b/src/routes/console/__layout.svelte
@@ -36,7 +36,10 @@
     <title>Appwrite - Console</title>
 </svelte:head>
 
-<Shell showSideNavigation={$page.url.pathname !== '/console' && !$page?.params.organization}>
+<Shell
+    showSideNavigation={$page.url.pathname !== '/console' &&
+        !$page?.params.organization &&
+        !$page.url.pathname.includes('/console/account')}>
     <svelte:fragment slot="header">
         <Header />
     </svelte:fragment>
diff --git a/src/routes/console/account/__layout.svelte b/src/routes/console/account/__layout.svelte
new file mode 100644
index 000000000..d6b6d2ab4
--- /dev/null
+++ b/src/routes/console/account/__layout.svelte
@@ -0,0 +1,51 @@
+<script lang="ts">
+    import { updateLayout } from '$lib/stores/layout';
+    import { user } from '$lib/stores/user';
+    import { afterNavigate } from '$app/navigation';
+    import { onMount } from 'svelte';
+
+    const path = 'console/account';
+
+    onMount(handle);
+    afterNavigate(handle);
+
+    async function handle(event = null) {
+        if (!$user) {
+            await user.fetchUser();
+        }
+        updateLayout({
+            navigate: event,
+            title: $user?.name,
+            level: 0,
+            customBase: '',
+            breadcrumbs: {
+                title: `${$user.name}`,
+                href: path
+            },
+            tabs: [
+                {
+                    href: path,
+                    title: 'Overview'
+                },
+                {
+                    href: `${path}/sessions`,
+                    title: 'Sessions'
+                },
+                {
+                    href: `${path}/activity`,
+                    title: 'Activity'
+                },
+                {
+                    href: `${path}/organizations`,
+                    title: 'Organizations'
+                }
+            ]
+        });
+    }
+</script>
+
+<svelte:head>
+    <title>Appwrite - User</title>
+</svelte:head>
+
+<slot />
diff --git a/src/routes/console/account/activity.svelte b/src/routes/console/account/activity.svelte
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/routes/console/account/index.svelte b/src/routes/console/account/index.svelte
new file mode 100644
index 000000000..ca3ffdad8
--- /dev/null
+++ b/src/routes/console/account/index.svelte
@@ -0,0 +1,183 @@
+<script lang="ts">
+    import { Button, Form, FormList, InputText, InputPassword } from '$lib/elements/forms';
+    import { CardGrid, Box, Avatar } from '$lib/components';
+    import { Container } from '$lib/layout';
+    import { onMount } from 'svelte';
+    import { user } from '$lib/stores/user';
+    import { sdkForConsole } from '$lib/stores/sdk';
+    import { addNotification } from '$lib/stores/notifications';
+    import { title, breadcrumbs } from '$lib/stores/layout';
+    import { base } from '$app/paths';
+
+    let name: string = null,
+        email: string = null,
+        emailPassword: string = null,
+        newPassword: string = null,
+        oldPassword: string = null;
+    // let showDelete = false;
+
+    onMount(async () => {
+        name ??= $user.name;
+        email ??= $user.email;
+    });
+
+    const getAvatar = (name: string) => sdkForConsole.avatars.getInitials(name, 96, 96).toString();
+
+    async function updateName() {
+        try {
+            await sdkForConsole.account.updateName(name);
+            $user.name = name;
+            title.set(name);
+            const breadcrumb = $breadcrumbs.get(0);
+            breadcrumb.title = name;
+            $breadcrumbs = $breadcrumbs.set($breadcrumbs.size, breadcrumb);
+            addNotification({
+                message: 'Name has been updated',
+                type: 'success'
+            });
+        } catch (error) {
+            addNotification({
+                message: error.message,
+                type: 'error'
+            });
+        }
+    }
+    async function updateEmail() {
+        try {
+            await sdkForConsole.account.updateEmail(email, emailPassword);
+            $user.email = email;
+            addNotification({
+                message: 'Email has been updated',
+                type: 'success'
+            });
+        } catch (error) {
+            addNotification({
+                message: error.message,
+                type: 'error'
+            });
+        }
+    }
+
+    async function updatePassword() {
+        try {
+            await sdkForConsole.account.updatePassword(newPassword, oldPassword);
+            addNotification({
+                message: 'Password has been updated',
+                type: 'success'
+            });
+        } catch (error) {
+            addNotification({
+                message: error.message,
+                type: 'error'
+            });
+        }
+    }
+</script>
+
+<Container>
+    <Form on:submit={updateName}>
+        <CardGrid>
+            <h6 class="heading-level-7">Update Name</h6>
+
+            <svelte:fragment slot="aside">
+                <ul>
+                    <InputText
+                        id="name"
+                        label="Name"
+                        placeholder="Enter name"
+                        autocomplete={false}
+                        autofocus={true}
+                        bind:value={name} />
+                </ul>
+            </svelte:fragment>
+
+            <svelte:fragment slot="actions">
+                <Button disabled={name === $user.name || !name} submit>Update</Button>
+            </svelte:fragment>
+        </CardGrid>
+    </Form>
+    <Form on:submit={updateEmail}>
+        <CardGrid>
+            <h6 class="heading-level-7">Update Email</h6>
+
+            <svelte:fragment slot="aside">
+                <FormList>
+                    <InputText
+                        id="email"
+                        label="Email"
+                        placeholder="Enter email"
+                        autocomplete={false}
+                        bind:value={email} />
+                    <InputPassword
+                        id="emailPassword"
+                        label="Password"
+                        placeholder="Enter password"
+                        autocomplete={false}
+                        showPasswordButton={true}
+                        bind:value={emailPassword} />
+                </FormList>
+            </svelte:fragment>
+
+            <svelte:fragment slot="actions">
+                <Button disabled={email === $user.email || !email || !emailPassword} submit
+                    >Update</Button>
+            </svelte:fragment>
+        </CardGrid>
+    </Form>
+    <Form on:submit={updatePassword}>
+        <CardGrid>
+            <h6 class="heading-level-7">Update Password</h6>
+            <p class="text">
+                Forgot your password? <a class="link" href={`${base}/recover`}
+                    >Recover your password</a>
+            </p>
+
+            <svelte:fragment slot="aside">
+                <FormList>
+                    <InputPassword
+                        id="newPassword"
+                        label="New password"
+                        placeholder="Enter password"
+                        autocomplete={false}
+                        showPasswordButton={true}
+                        bind:value={newPassword} />
+                    <InputPassword
+                        id="oldPassword"
+                        label="Old password"
+                        placeholder="Enter password"
+                        autocomplete={false}
+                        showPasswordButton={true}
+                        bind:value={oldPassword} />
+                </FormList>
+            </svelte:fragment>
+
+            <svelte:fragment slot="actions">
+                <Button disabled={!newPassword || !oldPassword} submit>Update</Button>
+            </svelte:fragment>
+        </CardGrid>
+    </Form>
+    <CardGrid>
+        <div>
+            <h6 class="heading-level-7">Delete Account</h6>
+        </div>
+        <p>
+            Your account will be permanently deleted and access will be lost to any of your teams
+            and data. This action is irreversible.
+        </p>
+        <svelte:fragment slot="aside">
+            <Box>
+                <svelte:fragment slot="image">
+                    <Avatar size={48} name={$user.name} src={getAvatar($user.name)} />
+                </svelte:fragment>
+                <svelte:fragment slot="title">
+                    <h6 class="u-bold">{$user.name}</h6>
+                </svelte:fragment>
+                <p>{$user.email}</p>
+            </Box>
+        </svelte:fragment>
+
+        <svelte:fragment slot="actions">
+            <Button secondary on:click={() => console.log('showDelete = true')}>Delete</Button>
+        </svelte:fragment>
+    </CardGrid>
+</Container>
diff --git a/src/routes/console/account/organizations.svelte b/src/routes/console/account/organizations.svelte
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/routes/console/account/session.svelte b/src/routes/console/account/session.svelte
new file mode 100644
index 000000000..e69de29bb