diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 2586df1492..02b8808589 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1123,6 +1123,7 @@
   "connect_apple_server": "Connect to Apple Server",
   "calendar_url": "Calendar URL",
   "apple_server_generate_password": "Generate an app specific password to use with {{appName}} at",
+  "unable_to_add_apple_calendar":"Unable to add this Apple Calendar account. Please ensure you're using an app-specific password rather than your account password.",
   "credentials_stored_encrypted": "Your credentials will be stored and encrypted.",
   "it_stored_encrypted": "It will be stored and encrypted.",
   "go_to_app_store": "Go to App Store",
@@ -2321,4 +2322,4 @@
   "lock_org_users_eventtypes":"Lock individual event type creation",
   "lock_org_users_eventtypes_description":"Prevent members from creating their own event types.",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
-}
\ No newline at end of file
+}
diff --git a/packages/app-store/applecalendar/api/add.ts b/packages/app-store/applecalendar/api/add.ts
index 2e9fb2788f..77b0eac89b 100644
--- a/packages/app-store/applecalendar/api/add.ts
+++ b/packages/app-store/applecalendar/api/add.ts
@@ -44,8 +44,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         data,
       });
     } catch (reason) {
-      logger.error("Could not add this caldav account", reason);
-      return res.status(500).json({ message: "Could not add this caldav account" });
+      logger.error("Could not add this apple calendar account", reason);
+      return res.status(500).json({ message: "unable_to_add_apple_calendar" });
     }
 
     return res
diff --git a/packages/app-store/applecalendar/pages/setup/index.tsx b/packages/app-store/applecalendar/pages/setup/index.tsx
index af700122e1..43ef54ebdc 100644
--- a/packages/app-store/applecalendar/pages/setup/index.tsx
+++ b/packages/app-store/applecalendar/pages/setup/index.tsx
@@ -51,19 +51,23 @@ export default function AppleCalendarSetup() {
               <Form
                 form={form}
                 handleSubmit={async (values) => {
-                  setErrorMessage("");
-                  const res = await fetch("/api/integrations/applecalendar/add", {
-                    method: "POST",
-                    body: JSON.stringify(values),
-                    headers: {
-                      "Content-Type": "application/json",
-                    },
-                  });
-                  const json = await res.json();
-                  if (!res.ok) {
-                    setErrorMessage(json?.message || t("something_went_wrong"));
-                  } else {
-                    router.push(json.url);
+                  try {
+                    setErrorMessage("");
+                    const res = await fetch("/api/integrations/applecalendar/add", {
+                      method: "POST",
+                      body: JSON.stringify(values),
+                      headers: {
+                        "Content-Type": "application/json",
+                      },
+                    });
+                    const json = await res.json();
+                    if (!res.ok) {
+                      setErrorMessage(t(json?.message) || t("something_went_wrong"));
+                    } else {
+                      router.push(json.url);
+                    }
+                  } catch (err) {
+                    setErrorMessage(t("unable_to_add_apple_calendar"));
                   }
                 }}>
                 <fieldset