diff --git a/packages/twenty-emails/src/emails/send-invite-link.email.tsx b/packages/twenty-emails/src/emails/send-invite-link.email.tsx
index 97d519e88..4abf1e0a9 100644
--- a/packages/twenty-emails/src/emails/send-invite-link.email.tsx
+++ b/packages/twenty-emails/src/emails/send-invite-link.email.tsx
@@ -18,6 +18,7 @@ type SendInviteLinkEmailProps = {
   sender: {
     email: string;
     firstName: string;
+    lastName: string;
   };
   serverUrl?: string;
 };
@@ -29,13 +30,14 @@ export const SendInviteLinkEmail = ({
   serverUrl,
 }: SendInviteLinkEmailProps) => {
   const workspaceLogo = getImageAbsoluteURI(workspace.logo, serverUrl);
+
   return (
     <BaseEmail width={333}>
       <Title value="Join your team on Twenty" />
       <MainText>
         {capitalize(sender.firstName)} (
         <Link
-          href={sender.email}
+          href={`mailto:${sender.email}`}
           value={sender.email}
           color={emailTheme.font.colors.blue}
         />
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
index 49b9e36a2..8460082e6 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
@@ -344,7 +344,11 @@ export class WorkspaceInvitationService {
         const emailData = {
           link: link.toString(),
           workspace: { name: workspace.displayName, logo: workspace.logo },
-          sender: { email: sender.email, firstName: sender.firstName },
+          sender: {
+            email: sender.email,
+            firstName: sender.firstName,
+            lastName: sender.lastName,
+          },
           serverUrl: this.environmentService.get('SERVER_URL'),
         };
 
@@ -358,9 +362,7 @@ export class WorkspaceInvitationService {
         });
 
         await this.emailService.send({
-          from: `${this.environmentService.get(
-            'EMAIL_FROM_NAME',
-          )} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
+          from: `${sender.firstName} ${sender.lastName} (via Twenty) <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
           to: invitation.value.email,
           subject: 'Join your team on Twenty',
           text,