From cbb5bce500d4676c9057c172cc390ba8072c780b Mon Sep 17 00:00:00 2001
From: neo773 <62795688+neo773@users.noreply.github.com>
Date: Tue, 18 Nov 2025 21:42:02 +0530
Subject: [PATCH] expose imap username field (#15866)

Had an edge with a customer where they had a custom username.
---
 .../SettingsAccountsConnectionForm.tsx          | 17 +++++++++++++++++
 .../imap-smtp-caldav-connection.service.ts      |  2 +-
 .../imap/providers/imap-client.provider.ts      |  5 ++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
index 29879764b8..841af508a9 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
@@ -120,6 +120,23 @@ export const SettingsAccountsConnectionForm = ({
             )}
           />
 
+          <Controller
+            name="IMAP.username"
+            control={control}
+            render={({ field, fieldState }) => (
+              <SettingsTextInput
+                instanceId="imap-username-connection-form"
+                label={t`IMAP Username (Optional)`}
+                placeholder={t`john.doe`}
+                type="text"
+                value={field.value || ''}
+                required={false}
+                onChange={field.onChange}
+                error={fieldState.error?.message}
+              />
+            )}
+          />
+
           <Controller
             name="IMAP.password"
             control={control}
diff --git a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/services/imap-smtp-caldav-connection.service.ts b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/services/imap-smtp-caldav-connection.service.ts
index f0e7b9c468..05f11b46d0 100644
--- a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/services/imap-smtp-caldav-connection.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/services/imap-smtp-caldav-connection.service.ts
@@ -31,7 +31,7 @@ export class ImapSmtpCaldavService {
       port: params.port,
       secure: params.secure ?? true,
       auth: {
-        user: handle,
+        user: params.username ?? handle,
         pass: params.password,
       },
       logger: false,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/providers/imap-client.provider.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/providers/imap-client.provider.ts
index 826075fd03..3e391d9a14 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/providers/imap-client.provider.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/providers/imap-client.provider.ts
@@ -1,5 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 
+import { isNonEmptyString } from '@sniptt/guards';
 import { ImapFlow } from 'imapflow';
 import { ConnectedAccountProvider } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
@@ -88,7 +89,9 @@ export class ImapClientProvider {
         port: connectionParameters.IMAP?.port || 993,
         secure: connectionParameters.IMAP?.secure,
         auth: {
-          user: connectedAccount.handle,
+          user: isNonEmptyString(connectionParameters.IMAP?.username)
+            ? connectionParameters.IMAP?.username
+            : connectedAccount.handle,
           pass: connectionParameters.IMAP?.password || '',
         },
         logger: false,