diff --git a/api/src/tablo.ts b/api/src/tablo.ts
index ef15726..98a46a7 100644
--- a/api/src/tablo.ts
+++ b/api/src/tablo.ts
@@ -178,8 +178,8 @@ tabloRouter.post("/create-and-invite", async (c) => {
     const { data: insertedTablo, error } = await supabase
       .from("tablos")
       .insert({
-        name: `${ownerDataTyped.name || "Propriétaire"} / ${
-          invitedUserDataTyped.name || "Invité"
+        name: `${invitedUserDataTyped.name || "Invité"} / ${
+          ownerDataTyped.name || "Propriétaire"
         }`,
         color: "bg-blue-500",
         status: "todo",
@@ -244,6 +244,7 @@ tabloRouter.post("/create-and-invite", async (c) => {
   // Send email notifications to both owner and invited user
   // Send email to the owner
   await transporter.sendMail({
+    from: "Xtablo <noreply@xtablo.com>",
     to: ownerDataTyped.email,
     subject: "Nouveau tablo créé - Réservation confirmée",
     html: `
@@ -264,6 +265,7 @@ tabloRouter.post("/create-and-invite", async (c) => {
 
   // Send email to the invited user
   await transporter.sendMail({
+    from: "Xtablo <noreply@xtablo.com>",
     to: invitedUserDataTyped.email,
     subject: "Réservation confirmée - Nouveau tablo créé",
     html: `
diff --git a/api/src/user.ts b/api/src/user.ts
index 8e047b5..ac5e777 100644
--- a/api/src/user.ts
+++ b/api/src/user.ts
@@ -95,7 +95,7 @@ userRouter.post("/mark-temporary", async (c) => {
   try {
     if (profile?.email) {
       const mailOptions = {
-        from: process.env.EMAIL_USER,
+        from: "Xtablo <noreply@xtablo.com>",
         to: profile.email,
         subject: "Bienvenue sur XTablo - Votre mot de passe temporaire",
         text: `Bienvenue sur XTablo !
diff --git a/ui/src/pages/landing.tsx b/ui/src/pages/landing.tsx
index 4466cf4..15f9167 100644
--- a/ui/src/pages/landing.tsx
+++ b/ui/src/pages/landing.tsx
@@ -6,6 +6,9 @@ import { Header } from "@ui/components/header";
 import { Link } from "react-router-dom";
 
 export const LandingPage = () => {
+  window.location.href = "https://www.xtablo.com";
+  return null;
+
   localStorage.setItem("xtablo-has-seen-landing-page", "true");
 
   const CheckIcon = () => {