diff --git a/web/app/components/FirebaseAuth.vue b/web/app/components/FirebaseAuth.vue
index 1c8e076a..5f783e07 100644
--- a/web/app/components/FirebaseAuth.vue
+++ b/web/app/components/FirebaseAuth.vue
@@ -7,6 +7,8 @@ import {
   signInWithEmailAndPassword,
   createUserWithEmailAndPassword,
   sendPasswordResetEmail,
+  updateProfile,
+  deleteUser,
 } from 'firebase/auth'
 import { mdiGoogle, mdiGithub, mdiEmail } from '@mdi/js'
 import type { User as FirebaseUser } from 'firebase/auth'
@@ -29,6 +31,7 @@ const showEmailForm = ref(false)
 const isSignUp = ref(false)
 const showForgotPassword = ref(false)
 const resetEmailSent = ref(false)
+const name = ref('')
 const email = ref('')
 const password = ref('')
 const generalError = ref('')
@@ -71,6 +74,10 @@ function validateEmail(): boolean {
 function validateLoginForm(): boolean {
   clearErrors()
   let valid = true
+  if (isSignUp.value && !name.value.trim()) {
+    errorMessages.value.add('name', 'Please provide your name')
+    valid = false
+  }
   if (!email.value.trim()) {
     errorMessages.value.add('email', 'Please provide an email address')
     valid = false
@@ -126,6 +133,18 @@ async function submitEmail() {
         email.value.trim(),
         password.value,
       )
+      try {
+        await updateProfile(result.user, {
+          displayName: name.value.trim(),
+        })
+      } catch (error) {
+        try {
+          await deleteUser(result.user)
+        } catch (deleteError) {
+          console.error(deleteError)
+        }
+        throw error
+      }
     } else {
       result = await signInWithEmailAndPassword(
         auth,
@@ -167,6 +186,11 @@ function backToSignIn() {
   showForgotPassword.value = false
 }
 
+function toggleAuthMode() {
+  clearErrors()
+  isSignUp.value = !isSignUp.value
+}
+
 function onSuccess(user: FirebaseUser, method: LoginMethod) {
   try {
     localStorage.setItem(LAST_LOGIN_METHOD_KEY, method)
@@ -405,11 +429,27 @@ function getGeneralErrorMessage(
       class="mt-4"
       @submit.prevent="submitEmail"
     >
+      <v-text-field
+        v-if="isSignUp"
+        v-model="name"
+        label="Name"
+        color="primary"
+        type="text"
+        variant="outlined"
+        density="comfortable"
+        class="mb-2"
+        persistent-placeholder
+        placeholder="Enter your full name (e.g. John Doe)"
+        :error="errorMessages.has('name')"
+        :error-messages="errorMessages.get('name')"
+      />
       <v-text-field
         v-model="email"
         label="Email Address"
         color="primary"
         type="email"
+        persistent-placeholder
+        placeholder="Enter your email address (e.g. john@gmail.com)"
         variant="outlined"
         density="comfortable"
         class="mb-2"
@@ -423,6 +463,8 @@ function getGeneralErrorMessage(
         color="primary"
         variant="outlined"
         density="comfortable"
+        placeholder="Create a secure /password"
+        persistent-placeholder
         class="mb-2"
         :error="errorMessages.has('password')"
         :error-messages="errorMessages.get('password')"
@@ -455,7 +497,7 @@ function getGeneralErrorMessage(
         size="small"
         color="primary"
         class="mt-2"
-        @click="isSignUp = !isSignUp"
+        @click="toggleAuthMode"
       >
         {{
           isSignUp ? 'Already have an account? Sign In' : 'No account? Sign Up'