diff --git a/apps/builder/components/shared/TypebotHeader/CollaborationMenuButton/CollaborationMenuButton.tsx b/apps/builder/components/shared/TypebotHeader/CollaborationMenuButton/CollaborationMenuButton.tsx
index e3aa8755a..fbfd23fdd 100644
--- a/apps/builder/components/shared/TypebotHeader/CollaborationMenuButton/CollaborationMenuButton.tsx
+++ b/apps/builder/components/shared/TypebotHeader/CollaborationMenuButton/CollaborationMenuButton.tsx
@@ -9,13 +9,18 @@ import { UsersIcon } from 'assets/icons'
 import React from 'react'
 import { CollaborationList } from './CollaborationList'
 
-export const CollaborationMenuButton = () => {
+export const CollaborationMenuButton = ({
+  isLoading,
+}: {
+  isLoading: boolean
+}) => {
   return (
     <Popover isLazy placement="bottom-end">
       <PopoverTrigger>
         <span>
           <Tooltip label="Invite users to collaborate">
             <IconButton
+              isLoading={isLoading}
               icon={<UsersIcon />}
               aria-label="Show collaboration menu"
               size="sm"
diff --git a/apps/builder/components/shared/TypebotHeader/TypebotHeader.tsx b/apps/builder/components/shared/TypebotHeader/TypebotHeader.tsx
index a972301ee..d119e1479 100644
--- a/apps/builder/components/shared/TypebotHeader/TypebotHeader.tsx
+++ b/apps/builder/components/shared/TypebotHeader/TypebotHeader.tsx
@@ -190,7 +190,7 @@ export const TypebotHeader = () => {
       </HStack>
 
       <HStack right="40px" pos="absolute" display={['none', 'flex']}>
-        <CollaborationMenuButton />
+        <CollaborationMenuButton isLoading={isNotDefined(typebot)} />
         {router.pathname.includes('/edit') && isNotDefined(rightPanel) && (
           <Button
             onClick={handlePreviewClick}
diff --git a/apps/builder/playwright/tests/bubbles/embed.spec.ts b/apps/builder/playwright/tests/bubbles/embed.spec.ts
index ddbaa790c..4bc3e354d 100644
--- a/apps/builder/playwright/tests/bubbles/embed.spec.ts
+++ b/apps/builder/playwright/tests/bubbles/embed.spec.ts
@@ -28,23 +28,7 @@ test.describe.parallel('Embed bubble block', () => {
       await page.goto(`/typebots/${typebotId}/edit`)
       await page.click('text=Click to edit...')
       await page.fill('input[placeholder="Paste the link or code..."]', pdfSrc)
-      await expect(page.locator('iframe#embed-bubble-content')).toHaveAttribute(
-        'src',
-        pdfSrc
-      )
-      await page.fill(
-        'input[placeholder="Paste the link or code..."]',
-        iframeCode
-      )
-      await expect(page.locator('iframe#embed-bubble-content')).toHaveAttribute(
-        'src',
-        'https://typebot.io'
-      )
-      await page.fill('input[placeholder="Paste the link or code..."]', siteSrc)
-      await expect(page.locator('iframe#embed-bubble-content')).toHaveAttribute(
-        'src',
-        siteSrc
-      )
+      await expect(page.locator('text="Show embed"')).toBeVisible()
     })
   })
 
diff --git a/apps/builder/playwright/tests/settings.spec.ts b/apps/builder/playwright/tests/settings.spec.ts
index 2cf124e41..d75d98456 100644
--- a/apps/builder/playwright/tests/settings.spec.ts
+++ b/apps/builder/playwright/tests/settings.spec.ts
@@ -54,6 +54,9 @@ test.describe.parallel('Settings page', () => {
         }
       )
       await page.goto(`/typebots/${typebotId}/settings`)
+      await expect(
+        typebotViewer(page).locator('a:has-text("Made with Typebot")')
+      ).toHaveAttribute('href', 'https://www.typebot.io/?utm_source=litebadge')
       await page.click('button:has-text("Typing emulation")')
       await page.fill('[data-testid="speed"] input', '350')
       await page.fill('[data-testid="max-delay"] input', '1.5')
diff --git a/packages/bot-engine/src/contexts/TypebotContext.tsx b/packages/bot-engine/src/contexts/TypebotContext.tsx
index f3edc770f..fa883f858 100644
--- a/packages/bot-engine/src/contexts/TypebotContext.tsx
+++ b/packages/bot-engine/src/contexts/TypebotContext.tsx
@@ -139,12 +139,13 @@ export const TypebotContext = ({
 }
 
 const formatIncomingVariableValue = (
-  value: string | number
-): string | number => {
+  value?: string | number
+): string | number | undefined => {
   // This first check avoid to parse 004 as the number 4.
   if (typeof value === 'string' && value.startsWith('0') && value.length > 1)
     return value
-  return isNaN(Number(value)) ? value : Number(value)
+  if (typeof value === 'number') return value
+  return isNaN(value?.toString() as unknown as number) ? value : Number(value)
 }
 
 export const useTypebot = () => useContext(typebotContext)