From 24de648252a2fb8e27c111b6da896a1f359b9043 Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Sun, 1 Mar 2026 10:20:09 +0100
Subject: [PATCH] fix(teamsbot): credential save when form visible, add
 debugMode merge

Made-with: Cursor
---
 src/pages/views/teamsbot/TeamsbotDashboardView.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/views/teamsbot/TeamsbotDashboardView.tsx b/src/pages/views/teamsbot/TeamsbotDashboardView.tsx
index acabf68..ba5fb32 100644
--- a/src/pages/views/teamsbot/TeamsbotDashboardView.tsx
+++ b/src/pages/views/teamsbot/TeamsbotDashboardView.tsx
@@ -127,8 +127,10 @@ export const TeamsbotDashboardView: React.FC = () => {
       return;
     }
 
-    // userAccount with new credentials: always save to DB (backend loads from there)
-    if (joinMode === 'userAccount' && showCredentialForm && credEmail && credPassword) {
+    // userAccount with new/unsaved credentials: save to DB before starting
+    const needsSave = joinMode === 'userAccount' && !userAccount?.hasSavedCredentials && credEmail && credPassword;
+    const needsUpdate = joinMode === 'userAccount' && showCredentialForm && credEmail && credPassword;
+    if (needsSave || needsUpdate) {
       try {
         setSavingCredentials(true);
         await teamsbotApi.saveUserAccount(instanceId, credEmail, credPassword);