diff --git a/components/user/Avatar.vue b/components/user/Avatar.vue
index 4fbc694..3da28ed 100644
--- a/components/user/Avatar.vue
+++ b/components/user/Avatar.vue
@@ -1,9 +1,26 @@
 <script setup lang="ts">
 const user = useSupabaseUser()
+const supabase = useSupabaseClient()
 const userData = user.value;
+
 var userAvatar = "";
+
+await supabase
+    .from('profiles')
+    .select('id, avatar_url')
+    .eq('id', userData?.id)
+    .then(({ data, error }) => {
+        if (error) {
+            console.log(error)
+        } else {
+            if (data.length > 0) {
+                userAvatar = data[0].avatar_url;
+            }
+        }
+    })
+
 </script>
 
 <template>
-    <UAvatar :src="userData?.user_metadata?.avatar_url" :alt="userData?.email" size="2xl" />
+    <UAvatar :src="userAvatar" :alt="userData?.email" size="2xl" />
 </template>
\ No newline at end of file
diff --git a/components/user/ProfileCard.vue b/components/user/ProfileCard.vue
index 6ca2297..990cacf 100644
--- a/components/user/ProfileCard.vue
+++ b/components/user/ProfileCard.vue
@@ -1,17 +1,50 @@
 <script setup lang="ts">
 const user = useSupabaseUser()
+const supabase = useSupabaseClient()
+
 const userData = user.value;
-var userAvatar = "";
-var editable = false;
+var editable = true;
 
 const state = reactive({
     email: userData?.email,
     phone: userData?.phone,
-    id: userData?.id
+    id: userData?.id,
+    username: ""
 })
 
-const onUpdate = () => {
+await supabase
+    .from('profiles')
+    .select('id, username')
+    .eq('id', userData?.id)
+    .then(({ data, error }) => {
+        if (error) {
+            console.log(error)
+        } else {
+            if (data.length > 0) {
+                state.username = data[0].username;
+            }
+        }
+    })
+
+
+
+const onUpdate = async () => {
+    const updates = {
+        id: userData?.id,
+        avatar_url: "https://avatars.dicebear.com/api/avataaars/John.svg",
+        username: state.username,
+        updated_at: new Date()
+    }
 
+    const { error } = await supabase.from('profiles').upsert(updates, {
+        returning: 'minimal', // Don't return the value after inserting
+    })
+
+    if (error) {
+        useToast().add({ title: 'Updated failed', description: error.message })
+    } else {
+        useToast().add({ title: 'Updated successfully', description: 'Profile data was updated.' })
+    }
 }
 
 </script>
@@ -33,6 +66,10 @@ const onUpdate = () => {
                 <UInput v-model="state.phone" :disabled="!editable" />
             </UFormGroup>
 
+            <UFormGroup label="Username" name="username">
+                <UInput v-model="state.username" :disabled="!editable" />
+            </UFormGroup>
+
             <UButton type="submit" :disabled="!editable">
                 Update
             </UButton>