diff --git a/apps/web/components/dialog/EditLocationDialog.tsx b/apps/web/components/dialog/EditLocationDialog.tsx
index 1c52f5d018..989bd71ac7 100644
--- a/apps/web/components/dialog/EditLocationDialog.tsx
+++ b/apps/web/components/dialog/EditLocationDialog.tsx
@@ -261,7 +261,7 @@ export const EditLocationDialog = (props: ISetLocationDialog) => {
             {booking && (
               <>
                 <p className="text-emphasis mb-2 ml-1 mt-6 text-sm font-bold">{t("current_location")}:</p>
-                <p className="text-emphasis mb-2 ml-1 text-sm">
+                <p className="text-emphasis mb-2 ml-1 break-all text-sm">
                   {getHumanReadableLocationValue(booking.location, t)}
                 </p>
               </>
diff --git a/apps/web/playwright/manage-booking-questions.e2e.ts b/apps/web/playwright/manage-booking-questions.e2e.ts
index 12e3a624e9..99bdf898ca 100644
--- a/apps/web/playwright/manage-booking-questions.e2e.ts
+++ b/apps/web/playwright/manage-booking-questions.e2e.ts
@@ -832,6 +832,8 @@ test.describe("Text area min and max characters text", () => {
       // wait until the button with data-testid="time" is visible
       await page.locator('[data-testid="time"]').isVisible();
 
+      await page.getByTestId("incrementMonth").click();
+
       // Get first button with data-testid="time"
       const timeButton = page.locator('[data-testid="time"]').first();
       await timeButton.click();
@@ -845,6 +847,8 @@ test.describe("Text area min and max characters text", () => {
 
       // Get button with data-testid="confirm-book-button"
       const submitForm = async () => await page.locator('[data-testid="confirm-book-button"]').click();
+      await page.fill('[name="name"]', "Booker");
+      await page.fill('[name="email"]', "booker@example.com");
       await textAreaWithoutMinMax.fill("1234567890");
       await textAreaWithMin5.fill("1234");
       await textAreaWithMax10.fill("12345678901");
diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts
index 636f49a35f..b7684b7f20 100644
--- a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts
@@ -118,6 +118,12 @@ export const editLocationHandler = async ({ ctx, input }: EditLocationOptions) =
         },
         data: {
           location,
+          metadata: location.startsWith("http")
+            ? {
+                ...(typeof booking.metadata === "object" ? booking.metadata : {}),
+                videoCallUrl: location,
+              }
+            : {},
           references: {
             create: updatedResult.referencesToCreate,
           },