diff --git a/src/renderer/extensions/vueNodes/components/NodeSlots.vue b/src/renderer/extensions/vueNodes/components/NodeSlots.vue
index 106ba5613fc..3a4cb6a5d8a 100644
--- a/src/renderer/extensions/vueNodes/components/NodeSlots.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeSlots.vue
@@ -9,7 +9,7 @@
     >
       <InputSlot
         v-for="(input, index) in filteredInputs"
-        :key="`input-${index}`"
+        :key="`input-${input.name}`"
         :slot-data="input"
         :node-type="nodeData?.type || ''"
         :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
@@ -23,7 +23,7 @@
     >
       <OutputSlot
         v-for="(output, index) in nodeData.outputs"
-        :key="`output-${index}`"
+        :key="`output-${output.name}`"
         :slot-data="output"
         :node-type="nodeData?.type || ''"
         :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
index c92fc8c9218..8cedc8200c0 100644
--- a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
+++ b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
@@ -183,6 +183,14 @@ export function useSlotElementTracking(options: {
         // Register slot
         const slotKey = getSlotKey(nodeId, index, type === 'input')
 
+        // Defensive cleanup: remove stale entry if it exists with different element
+        // This handles edge cases where Vue component reuse prevents proper unmount
+        const existingEntry = node.slots.get(slotKey)
+        if (existingEntry && existingEntry.el !== el) {
+          delete existingEntry.el.dataset.slotKey
+          layoutStore.deleteSlotLayout(slotKey)
+        }
+
         el.dataset.slotKey = slotKey
         node.slots.set(slotKey, { el, index, type })
 
diff --git a/src/stores/firebaseAuthStore.ts b/src/stores/firebaseAuthStore.ts
index 41bae52a285..32ae22a9ac2 100644
--- a/src/stores/firebaseAuthStore.ts
+++ b/src/stores/firebaseAuthStore.ts
@@ -278,7 +278,7 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
   }
 
   const createCustomer = async (): Promise<CreateCustomerResponse> => {
-    const authHeader = await getFirebaseAuthHeader()
+    const authHeader = await getAuthHeader()
     if (!authHeader) {
       throw new FirebaseAuthStoreError(t('toastMessages.userNotAuthenticated'))
     }