From 9767c418ee04e130566e2df06b5a808e3cd54ab2 Mon Sep 17 00:00:00 2001
From: BOHEUS <56270748+BOHEUS@users.noreply.github.com>
Date: Fri, 30 Jan 2026 15:58:42 +0000
Subject: [PATCH] Improve email onboarding step (#17427)

Related to https://github.com/twentyhq/core-team-issues/issues/1477
---
 .../src/pages/onboarding/SyncEmails.tsx       | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
index 0b43ec9b39..e80586defd 100644
--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
@@ -1,7 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useState } from 'react';
-import { useRecoilValue } from 'recoil';
+import { useRecoilState, useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
 
 import { SubTitle } from '@/auth/components/SubTitle';
@@ -27,6 +27,8 @@ import {
   MessageChannelVisibility,
   useSkipSyncEmailOnboardingStepMutation,
 } from '~/generated-metadata/graphql';
+import { lastAuthenticatedMethodState } from '@/auth/states/lastAuthenticatedMethodState';
+import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';
 
 const StyledSyncEmailsContainer = styled.div`
   display: flex;
@@ -56,6 +58,9 @@ export const SyncEmails = () => {
   const [visibility, setVisibility] = useState<MessageChannelVisibility>(
     MessageChannelVisibility.SHARE_EVERYTHING,
   );
+  const [lastAuthenticatedMethod] = useRecoilState(
+    lastAuthenticatedMethodState,
+  );
   const [skipSyncEmailOnboardingStatusMutation] =
     useSkipSyncEmailOnboardingStepMutation();
 
@@ -78,6 +83,9 @@ export const SyncEmails = () => {
     setNextOnboardingStatus();
   };
 
+  const userAuthenticatedWithSSO =
+    lastAuthenticatedMethod === AuthenticatedMethod.SSO;
+
   const isGoogleMessagingEnabled = useRecoilValue(
     isGoogleMessagingEnabledState,
   );
@@ -118,7 +126,7 @@ export const SyncEmails = () => {
         />
       </StyledSyncEmailsContainer>
       <StyledProviderContainer>
-        {isGoogleProviderEnabled && (
+        {!userAuthenticatedWithSSO && isGoogleProviderEnabled && (
           <MainButton
             title={t`Sync with Google`}
             onClick={() => handleButtonClick(ConnectedAccountProvider.GOOGLE)}
@@ -126,7 +134,7 @@ export const SyncEmails = () => {
             Icon={() => <IconGoogle size={theme.icon.size.sm} />}
           />
         )}
-        {isMicrosoftProviderEnabled && (
+        {!userAuthenticatedWithSSO && isMicrosoftProviderEnabled && (
           <MainButton
             title={t`Sync with Outlook`}
             onClick={() =>
@@ -143,6 +151,22 @@ export const SyncEmails = () => {
             width={144}
           />
         )}
+        {userAuthenticatedWithSSO && isMicrosoftProviderEnabled && (
+          <MainButton
+            title={t`Continue`}
+            onClick={() =>
+              handleButtonClick(ConnectedAccountProvider.MICROSOFT)
+            }
+            width={144}
+          />
+        )}
+        {userAuthenticatedWithSSO && isGoogleProviderEnabled && (
+          <MainButton
+            title={t`Continue`}
+            onClick={() => handleButtonClick(ConnectedAccountProvider.GOOGLE)}
+            width={144}
+          />
+        )}
       </StyledProviderContainer>
       <StyledActionLinkContainer>
         <ClickToActionLink onClick={continueWithoutSync}>