diff --git a/admin_frontend/src/web_api.rs b/admin_frontend/src/web_api.rs
index 936009d2..6d06e8c0 100644
--- a/admin_frontend/src/web_api.rs
+++ b/admin_frontend/src/web_api.rs
@@ -389,7 +389,7 @@ async fn logout_handler(
   state.session_store.del_user_session(session_id).await?;
   Ok((
     jar.remove(Cookie::from("session_id")),
-    htmx_redirect("/web/login"),
+    htmx_redirect("/web"),
   ))
 }
 
diff --git a/admin_frontend/templates/pages/open_appflowy_or_download.html b/admin_frontend/templates/pages/open_appflowy_or_download.html
index 1dda5b15..352ab124 100644
--- a/admin_frontend/templates/pages/open_appflowy_or_download.html
+++ b/admin_frontend/templates/pages/open_appflowy_or_download.html
@@ -2,30 +2,16 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8">
-    <title>Open App or Redirect</title>
+    <title>AppFlowy</title>
     <script>
-      function openApp() {
-        var appUrl = 'appflowy-flutter://';
-        var fallbackUrl = 'https://appflowy.io/download'; // URL to download page
-        var timeout = 2000; // 2 seconds
-
-        var timer = setTimeout(function () {
-          window.location = fallbackUrl;
-        }, timeout);
-
-        window.addEventListener('blur', function onWindowBlur() {
-          clearTimeout(timer); // Clear the timer if user focuses on the new tab/window (app opened)
-          window.removeEventListener('blur', onWindowBlur);
-        });
-
-        window.location = appUrl; // Try opening the app
-      }
-
-      window.onload = openApp; // Try to open the app right when the page loads
+      window.onload = function () {
+        window.location = 'appflowy-flutter://';
+      };
     </script>
   </head>
   <body>
     <h1>Opening AppFlowy</h1>
-    <p>If the app does not open, you will be redirected to the <a href="https://appflowy.io/download">download page</a>.</p>
+    <p>If AppFlowy does not open, you can click <a href="appflowy-flutter://">here</a> to launch the app.</p>
+    <p>If AppFlowy is not installed, you can <a href="https://appflowy.io/download">download AppFlowy manually</a>.</p>
   </body>
 </html>
diff --git a/src/mailer.rs b/src/mailer.rs
index 88bf974e..b42a8439 100644
--- a/src/mailer.rs
+++ b/src/mailer.rs
@@ -55,10 +55,13 @@ impl Mailer {
         lettre::Address::new("notify", "appflowy.io")?,
       ))
       .to(lettre::message::Mailbox::new(
-        Some(param.username),
+        Some(param.username.clone()),
         email.parse().unwrap(),
       ))
-      .subject("AppFlowy Workpace Invitation")
+      .subject(format!(
+        "Action required: {} invited you to {} in AppFlowy",
+        param.username, param.workspace_name
+      ))
       .header(ContentType::TEXT_HTML)
       .body(rendered)?;
 
@@ -70,7 +73,7 @@ impl Mailer {
 #[derive(serde::Serialize)]
 pub struct WorkspaceInviteMailerParam {
   pub user_icon_url: String,
-  pub username: String,
+  pub username: String, // Inviter
   pub workspace_name: String,
   pub workspace_icon_url: String,
   pub workspace_member_count: String,
