From 04689cbe251ecc3504667c988c8275c1fbeca646 Mon Sep 17 00:00:00 2001
From: Johanna Larsson <johanna.a.m.larsson@gmail.com>
Date: Fri, 11 Sep 2026 15:19:27 +0100
Subject: [PATCH] Improve logging and correct translation string

---
 crates/tranquil-api/src/server/session.rs | 46 +++++++++++------------
 frontend/src/locales/en.json              |  2 +-
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/crates/tranquil-api/src/server/session.rs b/crates/tranquil-api/src/server/session.rs
index 5074cef..d519700 100644
--- a/crates/tranquil-api/src/server/session.rs
+++ b/crates/tranquil-api/src/server/session.rs
@@ -317,29 +317,26 @@ pub async fn create_session(
         return Err(ApiError::InternalError(None));
     }
     if is_legacy_login && !used_totp_factor {
-        warn!(
-            did = %row.did,
-            ip = %client_ip,
-            "Legacy login on TOTP-enabled account - sending notification"
-        );
-        let hostname = &tranquil_config::get().server.hostname;
+        let alerts_enabled = match state.repos.infra.get_account_preferences(row.id).await {
+            Ok(prefs) => prefs
+                .iter()
+                .find(|(name, _)| name == "legacy_login_alerts")
+                .and_then(|(_, value)| value.as_bool())
+                .unwrap_or(true),
+            Err(e) => {
+                warn!("Failed to fetch legacy login alert preference: {:?}", e);
+                true
+            }
+        };
 
-        let alerts_enabled = state
-            .repos
-            .infra
-            .get_account_preferences(row.id)
-            .await
-            .map(|prefs| {
-                prefs
-                    .iter()
-                    .find(|(name, _)| name == "legacy_login_alerts")
-                    .and_then(|(_, value)| value.as_bool())
-                    .unwrap_or(true)
-            })
-            .unwrap_or(true);
-
-        if alerts_enabled
-            && let Err(e) = tranquil_pds::comms::comms_repo::enqueue_legacy_login(
+        if alerts_enabled {
+            warn!(
+                did = %row.did,
+                ip = %client_ip,
+                "Legacy login on TOTP-enabled account - sending notification"
+            );
+            let hostname = &tranquil_config::get().server.hostname;
+            if let Err(e) = tranquil_pds::comms::comms_repo::enqueue_legacy_login(
                 state.repos.user.as_ref(),
                 state.repos.infra.as_ref(),
                 row.id,
@@ -348,8 +345,9 @@ pub async fn create_session(
                 row.preferred_comms_channel,
             )
             .await
-        {
-            error!("Failed to queue legacy login notification: {:?}", e);
+            {
+                error!("Failed to queue legacy login notification: {:?}", e);
+            }
         }
     }
     let handle = row.handle.clone();
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 3f2d63e..ee04341 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -461,7 +461,7 @@
     "discordOpenLink": "Open Discord to verify",
     "securityAlerts": "Security alerts",
     "legacyLoginAlerts": "Legacy login alerts",
-    "legacyLoginAlertsDescription": "Get notified when someone signs in to your TOTP enabled account without using legacy login methods.",
+    "legacyLoginAlertsDescription": "Get notified when someone signs in to your TOTP enabled account using legacy login methods.",
     "enableLegacyLoginAlerts": "Enable legacy login alerts",
     "disableLegacyLoginAlerts": "Disable legacy login alerts"
   },