diff --git a/frontend/src/components/CommunicationArea.vue b/frontend/src/components/CommunicationArea.vue
index e98ec6a1..c8fb92a7 100644
--- a/frontend/src/components/CommunicationArea.vue
+++ b/frontend/src/components/CommunicationArea.vue
@@ -197,7 +197,7 @@ async function sendMail() {
     doctype: props.doctype,
     name: doc.value.data.name,
     send_email: 1,
-    sender: getUser().name,
+    sender: getUser().email,
     sender_full_name: getUser()?.full_name || undefined,
   })
 }
@@ -207,7 +207,7 @@ async function sendComment() {
     reference_doctype: props.doctype,
     reference_name: doc.value.data.name,
     content: newComment.value,
-    comment_email: getUser().name,
+    comment_email: getUser().email,
     comment_by: getUser()?.full_name || undefined,
   })
   if (comment && attachments.value.length) {
diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue
index e6cab0a8..84a30d44 100644
--- a/frontend/src/components/Modals/DealModal.vue
+++ b/frontend/src/components/Modals/DealModal.vue
@@ -228,7 +228,7 @@ function openQuickEntryModal() {
 onMounted(() => {
   Object.assign(deal, props.defaults)
   if (!deal.deal_owner) {
-    deal.deal_owner = getUser().email
+    deal.deal_owner = getUser().name
   }
 })
 </script>
diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue
index 5441370a..c358f121 100644
--- a/frontend/src/components/Modals/LeadModal.vue
+++ b/frontend/src/components/Modals/LeadModal.vue
@@ -180,7 +180,7 @@ function openQuickEntryModal() {
 onMounted(() => {
   Object.assign(lead, props.defaults)
   if (!lead.lead_owner) {
-    lead.lead_owner = getUser().email
+    lead.lead_owner = getUser().name
   }
 })
 </script>
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index 7b082a3a..a515346f 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -178,7 +178,7 @@ function redirect() {
 
 async function updateTask() {
   if (!_task.value.assigned_to) {
-    _task.value.assigned_to = getUser().email
+    _task.value.assigned_to = getUser().name
   }
   if (_task.value.name) {
     let d = await call('frappe.client.set_value', {
diff --git a/frontend/src/stores/users.js b/frontend/src/stores/users.js
index da1ed6f9..bee56d56 100644
--- a/frontend/src/stores/users.js
+++ b/frontend/src/stores/users.js
@@ -17,10 +17,10 @@ export const usersStore = defineStore('crm-users', () => {
     auto: true,
     transform(users) {
       for (let user of users) {
-        if (user.name === 'Administrator') {
-          user.email = 'Administrator'
-        }
         usersByName[user.name] = user
+        if (user.name === 'Administrator') {
+          usersByName[user.email] = user
+        }
       }
       return users
     },