diff --git a/src/app/components/form/PasswordField.vue b/src/app/components/form/PasswordField.vue
new file mode 100644
index 00000000..e2bca565
--- /dev/null
+++ b/src/app/components/form/PasswordField.vue
@@ -0,0 +1,19 @@
+<template>
+  <Label :for="id" class="font-semibold md:align-middle md:leading-10">
+    {{ label }}
+  </Label>
+  <input
+    :id="id"
+    v-model.trim="data"
+    :name="id"
+    type="password"
+    :autocomplete="autocomplete"
+    class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
+  />
+</template>
+
+<script lang="ts" setup>
+defineProps<{ id: string; label: string; autocomplete: string }>();
+
+const data = defineModel<string>();
+</script>
diff --git a/src/app/components/form/TextField.vue b/src/app/components/form/TextField.vue
index f3271074..6a1a79fa 100644
--- a/src/app/components/form/TextField.vue
+++ b/src/app/components/form/TextField.vue
@@ -4,7 +4,7 @@
   </Label>
   <input
     :id="id"
-    v-model="data"
+    v-model.trim="data"
     :name="id"
     type="text"
     class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
diff --git a/src/app/pages/clients/[id].vue b/src/app/pages/clients/[id].vue
index 1f2fcabb..fdb63a68 100644
--- a/src/app/pages/clients/[id].vue
+++ b/src/app/pages/clients/[id].vue
@@ -10,7 +10,7 @@
             <FormHeading>
               {{ $t('me.sectionGeneral') }}
             </FormHeading>
-            <FormTextField id="name" v-model.trim="data.name" label="Name" />
+            <FormTextField id="name" v-model="data.name" label="Name" />
             <FormSwitchField
               id="enabled"
               v-model="data.enabled"
@@ -18,7 +18,7 @@
             />
             <FormDateField
               id="expiresAt"
-              v-model.trim="data.expiresAt"
+              v-model="data.expiresAt"
               label="Expire Date"
             />
           </FormGroup>
@@ -26,12 +26,12 @@
             <FormHeading>Address</FormHeading>
             <FormTextField
               id="ipv4Address"
-              v-model.trim="data.ipv4Address"
+              v-model="data.ipv4Address"
               label="IPv4"
             />
             <FormTextField
               id="ipv6Address"
-              v-model.trim="data.ipv6Address"
+              v-model="data.ipv6Address"
               label="IPv6"
             />
           </FormGroup>
diff --git a/src/app/pages/me.vue b/src/app/pages/me.vue
index a3bb970d..1a367611 100644
--- a/src/app/pages/me.vue
+++ b/src/app/pages/me.vue
@@ -5,116 +5,106 @@
         <PanelHeadTitle :text="$t('pages.me')" />
       </PanelHead>
       <PanelBody class="dark:text-neutral-200">
-        <section class="grid grid-cols-1 gap-4 md:grid-cols-2">
-          <h4 class="col-span-full py-6 text-2xl">
-            {{ $t('me.sectionGeneral') }}
-          </h4>
-          <Label
-            for="username"
-            class="font-semibold md:align-middle md:leading-10"
-          >
-            {{ $t('username') }}
-          </Label>
-          <input
-            id="username"
-            v-model.trim="username"
-            type="text"
-            class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
-          />
-          <Label for="name" class="font-semibold md:align-middle md:leading-10">
-            {{ $t('name') }}
-          </Label>
-          <input
-            id="name"
-            v-model.trim="name"
-            type="text"
-            class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
-          />
-          <Label
-            for="email"
-            class="font-semibold md:align-middle md:leading-10"
-          >
-            {{ $t('email') }}
-          </Label>
-          <input
-            id="email"
-            v-model.trim="email"
-            type="email"
-            class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
-          />
-          <div class="col-span-full">
-            <BaseButton @click="submit">{{ $t('save') }}</BaseButton>
-          </div>
-        </section>
-        <section class="grid grid-cols-1 gap-4 md:grid-cols-2">
-          <h4 class="col-span-full py-6 text-2xl">
-            {{ $t('me.sectionPassword') }}
-          </h4>
-          <Label
-            for="current-password"
-            class="font-semibold md:align-middle md:leading-10"
-          >
-            {{ $t('currentPassword') }}
-          </Label>
-          <input
-            id="current-password"
-            v-model.trim="currentPassword"
-            type="password"
-            autocomplete="current-password"
-            class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
-          />
-          <Label
-            for="new-password"
-            class="font-semibold md:align-middle md:leading-10"
-          >
-            {{ $t('setup.newPassword') }}
-          </Label>
-          <input
-            id="new-password"
-            v-model.trim="newPassword"
-            type="password"
-            autocomplete="new-password"
-            class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
-          />
-          <Label
-            for="confirm-password"
-            class="font-semibold md:align-middle md:leading-10"
-          >
-            {{ $t('confirmPassword') }}
-          </Label>
-          <input
-            id="confirm-password"
-            v-model.trim="confirmPassword"
-            type="password"
-            autocomplete="new-password"
-            class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
-          />
-          <div class="col-span-full">
-            <BaseButton @click="updatePassword">{{
-              $t('updatePassword')
-            }}</BaseButton>
-          </div>
-        </section>
+        <FormElement @submit.prevent="submit">
+          <FormGroup>
+            <FormHeading>{{ $t('me.sectionGeneral') }}</FormHeading>
+            <FormTextField id="name" v-model="name" :label="$t('name')" />
+            <FormTextField id="email" v-model="email" :label="$t('email')" />
+            <FormActionField type="submit" :label="$t('save')" />
+          </FormGroup>
+        </FormElement>
+        <FormElement @submit.prevent="updatePassword">
+          <FormGroup>
+            <FormHeading>{{ $t('me.sectionPassword') }}</FormHeading>
+            <FormPasswordField
+              id="current-password"
+              v-model="currentPassword"
+              autocomplete="current-password"
+              :label="$t('currentPassword')"
+            />
+            <FormPasswordField
+              id="new-password"
+              v-model="newPassword"
+              autocomplete="new-password"
+              :label="$t('setup.newPassword')"
+            />
+            <FormPasswordField
+              id="confirm-password"
+              v-model="confirmPassword"
+              autocomplete="new-password"
+              :label="$t('confirmPassword')"
+            />
+            <FormActionField type="submit" :label="$t('updatePassword')" />
+          </FormGroup>
+        </FormElement>
       </PanelBody>
     </Panel>
   </main>
 </template>
 
 <script setup lang="ts">
+import { FetchError } from 'ofetch';
 const authStore = useAuthStore();
 authStore.update();
+const toast = useToast();
 
-const username = ref(authStore.userData?.username);
 const name = ref(authStore.userData?.name);
-const email = ref(authStore.userData?.email);
 
-// TODO: handle update password
+const rawEmail = ref(authStore.userData?.email);
+const email = computed({
+  get: () => rawEmail.value ?? undefined,
+  set: (value) => {
+    const temp = value?.trim() ?? null;
+    if (temp === '') {
+      rawEmail.value = null;
+      return;
+    }
+    rawEmail.value = temp;
+    return;
+  },
+});
 
-const currentPassword = ref(authStore.userData?.email);
-const newPassword = ref(authStore.userData?.email);
-const confirmPassword = ref(authStore.userData?.email);
+async function submit() {
+  try {
+    const res = await $fetch(`/api/me`, {
+      method: 'post',
+      body: {
+        name: name.value,
+        email: rawEmail.value,
+      },
+    });
+    toast.showToast({
+      type: 'success',
+      title: 'Success',
+      message: 'Saved',
+    });
+    if (!res.success) {
+      throw new Error('Failed to save');
+    }
+    await refreshNuxtData();
+  } catch (e) {
+    if (e instanceof FetchError) {
+      toast.showToast({
+        type: 'error',
+        title: 'Error',
+        message: e.data.message,
+      });
+    }
+  }
+}
 
-function submit() {}
+// TODO: handle update password
+const currentPassword = ref('');
+const newPassword = ref('');
+const confirmPassword = ref('');
 
-function updatePassword() {}
+function updatePassword() {
+  if (newPassword.value !== confirmPassword.value) {
+    toast.showToast({
+      type: 'error',
+      title: 'Error',
+      message: 'Passwords do not match',
+    });
+  }
+}
 </script>
diff --git a/src/server/api/me/index.post.ts b/src/server/api/me/index.post.ts
new file mode 100644
index 00000000..324b4552
--- /dev/null
+++ b/src/server/api/me/index.post.ts
@@ -0,0 +1,13 @@
+import { UserUpdateSchema } from '#db/repositories/user/types';
+
+export default definePermissionEventHandler(
+  actions.CLIENT,
+  async ({ event, user }) => {
+    const { name, email } = await readValidatedBody(
+      event,
+      validateZod(UserUpdateSchema)
+    );
+    await Database.users.update(user.id, name, email);
+    return { success: true };
+  }
+);
diff --git a/src/server/database/repositories/user/service.ts b/src/server/database/repositories/user/service.ts
index 209fe99d..34cffff1 100644
--- a/src/server/database/repositories/user/service.ts
+++ b/src/server/database/repositories/user/service.ts
@@ -14,6 +14,14 @@ function createPreparedStatement(db: DBType) {
         where: eq(user.username, sql.placeholder('username')),
       })
       .prepare(),
+    update: db
+      .update(user)
+      .set({
+        name: sql.placeholder('name') as never as string,
+        email: sql.placeholder('email') as never as string,
+      })
+      .where(eq(user.id, sql.placeholder('id')))
+      .prepare(),
   };
 }
 
@@ -60,4 +68,8 @@ export class UserService {
       });
     });
   }
+
+  async update(id: ID, name: string, email: string | null) {
+    return this.#statements.update.execute({ id, name, email });
+  }
 }
diff --git a/src/server/database/repositories/user/types.ts b/src/server/database/repositories/user/types.ts
index 7b629365..9c519d7d 100644
--- a/src/server/database/repositories/user/types.ts
+++ b/src/server/database/repositories/user/types.ts
@@ -20,6 +20,18 @@ const password = z
 
 const remember = z.boolean({ message: 'zod.user.remember' });
 
+const name = z
+  .string({ message: 'zod.user.name' })
+  .min(1, 'zod.user.nameMin')
+  .pipe(safeStringRefine);
+
+const email = z
+  .string({ message: 'zod.user.email' })
+  .min(5, 'zod.user.emailMin')
+  .email({ message: 'zod.user.emailInvalid' })
+  .pipe(safeStringRefine)
+  .nullable();
+
 export const UserLoginSchema = z.object(
   {
     username: username,
@@ -41,3 +53,11 @@ export const UserSetupType = z.object(
   },
   { message: objectMessage }
 );
+
+export const UserUpdateSchema = z.object(
+  {
+    name: name,
+    email: email,
+  },
+  { message: objectMessage }
+);