diff --git a/backend/canisters/user/CHANGELOG.md b/backend/canisters/user/CHANGELOG.md
index ef66390b02..203b4e8ac9 100644
--- a/backend/canisters/user/CHANGELOG.md
+++ b/backend/canisters/user/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Changed
+
+- Debug potential swap slippage for single user ([#5957](https://github.com/open-chat-labs/open-chat/pull/5957))
+
 ## [[2.0.1211](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1211-user)] - 2024-06-21
 
 ### Added
diff --git a/backend/canisters/user/impl/src/lib.rs b/backend/canisters/user/impl/src/lib.rs
index 6988e79467..e9fca6bca0 100644
--- a/backend/canisters/user/impl/src/lib.rs
+++ b/backend/canisters/user/impl/src/lib.rs
@@ -18,6 +18,7 @@ use fire_and_forget_handler::FireAndForgetHandler;
 use model::chit::ChitEarnedEvents;
 use model::contacts::Contacts;
 use model::favourite_chats::FavouriteChats;
+use model::token_swaps::TokenSwap;
 use notifications_canister::c2c_push_notification;
 use serde::{Deserialize, Serialize};
 use serde_bytes::ByteBuf;
@@ -146,6 +147,22 @@ impl RuntimeState {
     }
 
     pub fn metrics(&self) -> Metrics {
+        // TODO: Remove token_swaps from Metrics after next release
+        let mut token_swaps: Vec<TokenSwap> = Vec::new();
+        let my_user_id: UserId = self.env.canister_id().into();
+        let debug_user: UserId = Principal::from_text("pzg6u-5qaaa-aaaar-azjpa-cai").unwrap().into();
+
+        if my_user_id == debug_user {
+            // Show swaps from 2024/06/06 12:00 to 2024/06/07 12:00
+            token_swaps = self
+                .data
+                .token_swaps
+                .iter()
+                .filter(|ts| ts.started > 1717671600000 && ts.started < 1717758000000)
+                .cloned()
+                .collect();
+        }
+
         Metrics {
             heap_memory_used: utils::memory::heap(),
             stable_memory_used: utils::memory::stable(),
@@ -171,6 +188,7 @@ impl RuntimeState {
                 escrow: self.data.escrow_canister_id,
                 icp_ledger: Cryptocurrency::InternetComputer.ledger_canister_id().unwrap(),
             },
+            token_swaps,
         }
     }
 }
@@ -335,6 +353,7 @@ pub struct Metrics {
     pub video_call_operators: Vec<Principal>,
     pub timer_jobs: u32,
     pub canister_ids: CanisterIds,
+    pub token_swaps: Vec<TokenSwap>,
 }
 
 fn run_regular_jobs() {
diff --git a/frontend/app/src/components/SignInWithMagicLink.svelte b/frontend/app/src/components/SignInWithMagicLink.svelte
index 6856d4204a..9c72139e5b 100644
--- a/frontend/app/src/components/SignInWithMagicLink.svelte
+++ b/frontend/app/src/components/SignInWithMagicLink.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { onMount, getContext } from "svelte";
+    import { onMount, getContext, createEventDispatcher } from "svelte";
     import type { OpenChat } from "openchat-client";
     import { i18nKey } from "../i18n/i18n";
     import Translatable from "./Translatable.svelte";
@@ -9,6 +9,7 @@
     import { Pincode, PincodeInput } from "svelte-pincode";
 
     const client = getContext<OpenChat>("client");
+    const dispatch = createEventDispatcher();
 
     let qs = window.location.search;
     let status: string | undefined = undefined;
@@ -36,9 +37,13 @@
         client
             .handleMagicLink(qs)
             .then((resp) => {
-                status = "magicLink." + resp.kind;
                 if (resp.kind === "success") {
+                    dispatch("close");
+                } else if (resp.kind === "session_not_found") {
                     message = "magicLink.continueMessage";
+                    status = "magicLink.success";
+                } else {
+                    status = "magicLink." + resp.kind;
                 }
             })
             .catch((_) => {
diff --git a/frontend/app/src/components/home/profile/SwapCrypto.svelte b/frontend/app/src/components/home/profile/SwapCrypto.svelte
index 8d22cfbb3f..954334420c 100644
--- a/frontend/app/src/components/home/profile/SwapCrypto.svelte
+++ b/frontend/app/src/components/home/profile/SwapCrypto.svelte
@@ -46,8 +46,6 @@
     $: anySwapsAvailable = Object.keys(swaps).length > 0 && detailsOut !== undefined;
     $: swapping = state === "swap" && busy;
     $: amountInText = client.formatTokens(amountIn, detailsIn.decimals);
-    $: minAmountOut =
-        bestQuote !== undefined ? (bestQuote[1] * BigInt(98)) / BigInt(100) : BigInt(0);
 
     $: {
         valid =
@@ -138,7 +136,7 @@
     }
 
     function swap() {
-        if (!valid) return;
+        if (!valid || bestQuote === undefined) return;
 
         busy = true;
         error = undefined;
@@ -146,8 +144,10 @@
 
         swapId = random128();
 
+        let minAmountOut = (bestQuote[1] * BigInt(98)) / BigInt(100);
+
         client
-            .swapTokens(swapId, ledgerIn, ledgerOut!, amountIn, minAmountOut, bestQuote![0])
+            .swapTokens(swapId, ledgerIn, ledgerOut!, amountIn, minAmountOut, bestQuote[0])
             .catch(() => (swapId = undefined))
             .finally(() => (busy = false));
     }
diff --git a/frontend/app/src/components/landingpages/HomePage.svelte b/frontend/app/src/components/landingpages/HomePage.svelte
index 3f61ca4112..b71c13fde3 100644
--- a/frontend/app/src/components/landingpages/HomePage.svelte
+++ b/frontend/app/src/components/landingpages/HomePage.svelte
@@ -50,7 +50,7 @@
 
 {#if showSignInWithMagicLinkModal}
     <Overlay>
-        <SignInWithMagicLink />
+        <SignInWithMagicLink on:close={() => (showSignInWithMagicLinkModal = false)} />
     </Overlay>
 {/if}
 
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index 526ea7eae0..05e1886267 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -523,6 +523,9 @@ import {
     shouldThrottle,
     throttleDeadline,
 } from "./stores/throttling";
+import { storeEmailSignInSession } from "openchat-shared";
+import { getEmailSignInSession } from "openchat-shared";
+import { removeEmailSignInSession } from "openchat-shared";
 
 const MARK_ONLINE_INTERVAL = 61 * 1000;
 const SESSION_TIMEOUT_NANOS = BigInt(30 * 24 * 60 * 60 * 1000 * 1000 * 1000); // 30 days
@@ -6271,12 +6274,36 @@ export class OpenChat extends OpenChatAgentWorker {
         return this.sendRequest({ kind: "updateBtcBalance", userId: this._liveState.user.userId });
     }
 
-    generateMagicLink(
+    async generateMagicLink(
         email: string,
         sessionKey: ECDSAKeyIdentity,
     ): Promise<GenerateMagicLinkResponse> {
         const sessionKeyDer = toDer(sessionKey);
-        return this.sendRequest({ kind: "generateMagicLink", email, sessionKey: sessionKeyDer });
+
+        const resp = await this.sendRequest({
+            kind: "generateMagicLink",
+            email,
+            sessionKey: sessionKeyDer,
+        }).catch(
+            (error) =>
+                ({
+                    kind: "failed_to_send_email",
+                    error: error.toString(),
+                }) as GenerateMagicLinkResponse,
+        );
+
+        if (resp.kind === "success") {
+            await storeEmailSignInSession(this._authClientStorage, {
+                key: sessionKey,
+                email,
+                userKey: resp.userKey,
+                expiration: resp.expiration,
+            });
+        } else {
+            await removeEmailSignInSession(this._authClientStorage);
+        }
+
+        return resp;
     }
 
     async handleMagicLink(qs: string): Promise<HandleMagicLinkResponse> {
@@ -6285,15 +6312,30 @@ export class OpenChat extends OpenChatAgentWorker {
         const response = await fetch(`https://${signInWithEmailCanister}.raw.icp0.io/auth${qs}`);
 
         if (response.ok) {
-            return { kind: "success" } as HandleMagicLinkResponse;
+            const session = await getEmailSignInSession(this._authClientStorage);
+            if (session === undefined) {
+                return { kind: "session_not_found" };
+            }
+
+            await this.getSignInWithEmailDelegation(
+                session.email,
+                session.userKey,
+                session.key,
+                session.expiration,
+            ).catch((error) => ({
+                kind: "error",
+                error: error.toString(),
+            }));
+
+            return { kind: "success" };
         } else if (response.status === 400) {
             const body = await response.text();
             if (body === "Link expired") {
-                return { kind: "link_expired" } as HandleMagicLinkResponse;
+                return { kind: "link_expired" };
             }
         }
 
-        return { kind: "link_invalid" } as HandleMagicLinkResponse;
+        return { kind: "link_invalid" };
     }
 
     async getSignInWithEmailDelegation(
diff --git a/frontend/openchat-shared/src/domain/email.ts b/frontend/openchat-shared/src/domain/email.ts
index ae6342abe9..1feeb53e40 100644
--- a/frontend/openchat-shared/src/domain/email.ts
+++ b/frontend/openchat-shared/src/domain/email.ts
@@ -6,5 +6,6 @@ export type GenerateMagicLinkResponse =
 
 export type HandleMagicLinkResponse =
     | { kind: "success" }
+    | { kind: "session_not_found" }
     | { kind: "link_invalid" }
     | { kind: "link_expired" };
diff --git a/frontend/openchat-shared/src/utils/emailSignInSessionStorage.ts b/frontend/openchat-shared/src/utils/emailSignInSessionStorage.ts
new file mode 100644
index 0000000000..f1f5296467
--- /dev/null
+++ b/frontend/openchat-shared/src/utils/emailSignInSessionStorage.ts
@@ -0,0 +1,55 @@
+import type { AuthClientStorage } from "@dfinity/auth-client";
+import { ECDSAKeyIdentity } from "@dfinity/identity";
+
+const KEY_STORAGE_EMAIL_LINK = "email_link";
+const KEY_STORAGE_EMAIL_LINK_CONTEXT = "email_link_context";
+
+export type EmailSignInSession = EmailSignInContext & {
+    key: ECDSAKeyIdentity;
+};
+
+export type EmailSignInContext = {
+    email: string;
+    userKey: Uint8Array;
+    expiration: bigint;
+};
+
+export async function storeEmailSignInSession(
+    storage: AuthClientStorage,
+    session: EmailSignInSession,
+): Promise<void> {
+    await storage.set(KEY_STORAGE_EMAIL_LINK, session.key.getKeyPair());
+
+    await storage.set(
+        KEY_STORAGE_EMAIL_LINK_CONTEXT,
+        JSON.stringify({
+            email: session.email,
+            userKey: Array.from(session.userKey),
+            expiration: session.expiration.toString(),
+        }),
+    );
+}
+
+export async function getEmailSignInSession(
+    storage: AuthClientStorage,
+): Promise<EmailSignInSession | undefined> {
+    const keyPair = (await storage.get(KEY_STORAGE_EMAIL_LINK)) as CryptoKeyPair | null;
+    if (keyPair == null) return undefined;
+    const contextString = (await storage.get(KEY_STORAGE_EMAIL_LINK_CONTEXT)) as string | null;
+    if (contextString == null) return undefined;
+
+    const key = await ECDSAKeyIdentity.fromKeyPair(keyPair);
+    const context = JSON.parse(contextString);
+
+    return {
+        key,
+        email: context.email,
+        userKey: Uint8Array.from(context.userKey),
+        expiration: BigInt(context.expiration),
+    };
+}
+
+export async function removeEmailSignInSession(storage: AuthClientStorage): Promise<void> {
+    storage.remove(KEY_STORAGE_EMAIL_LINK);
+    storage.remove(KEY_STORAGE_EMAIL_LINK_CONTEXT);
+}
diff --git a/frontend/openchat-shared/src/utils/index.ts b/frontend/openchat-shared/src/utils/index.ts
index 4807f07b59..1f9be47f74 100644
--- a/frontend/openchat-shared/src/utils/index.ts
+++ b/frontend/openchat-shared/src/utils/index.ts
@@ -1,4 +1,5 @@
 export { getTimeUntilSessionExpiryMs } from "./session";
+export * from "./emailSignInSessionStorage";
 export * from "./i18n";
 export * from "./identity";
 export * from "./identityStorage";