diff --git a/frontend/src/components/mining/PassiveMiningDialog.vue b/frontend/src/components/mining/PassiveMiningDialog.vue
index 2b927c0aa..cf7d6376f 100644
--- a/frontend/src/components/mining/PassiveMiningDialog.vue
+++ b/frontend/src/components/mining/PassiveMiningDialog.vue
@@ -34,6 +34,7 @@ const miningSource = ref<MiningSource>();
 
 const $leadminerStore = useLeadminerStore();
 const $supabase = useSupabaseClient();
+const $toast = useToast();
 
 const { t } = useI18n({
   useScope: 'local',
@@ -54,15 +55,25 @@ function closePassiveMiningDialog() {
 
 async function enablePassiveMining() {
   if (miningSource.value) {
-    const { error } = await $supabase
-      // @ts-expect-error: Issue with nuxt/supabase
-      .schema('private')
-      .from('mining_sources')
-      .update({ passive_mining: true })
-      .match({ email: miningSource.value.email });
+    try {
+      const { error } = await $supabase
+        // @ts-expect-error: Issue with nuxt/supabase
+        .schema('private')
+        .from('mining_sources')
+        .update({ passive_mining: true })
+        .match({ email: miningSource.value.email });
 
-    if (error) {
-      throw error;
+      if (error) {
+        throw error;
+      }
+    } catch (error) {
+      $toast.add({
+        severity: 'error',
+        summary: t('passive_mining_update_failed'),
+        detail: (error as Error).message,
+        life: 4500,
+      });
+      return;
     }
   }
   closePassiveMiningDialog();
@@ -75,14 +86,15 @@ async function enablePassiveMining() {
     "header": "Continuous Contact Extraction",
     "paragraph_1": "New contacts found in incoming emails will be automatically saved.",
     "paragraph_2": "Enable continuous contact extraction from future emails?",
-    "yes_enable": "Yes, enable"
+    "yes_enable": "Yes, enable",
+    "passive_mining_update_failed": "Unable to update continuous mining"
   },
   "fr": {
     "header": "Extraction continue des contacts",
     "paragraph_1": "Les nouveaux contacts trouvés dans les e-mails entrants seront automatiquement enregistrés.",
     "paragraph_2": "Activer l'extraction continue des contacts à partir des futurs e-mails ?",
-
-    "yes_enable": "Oui, activer"
+    "yes_enable": "Oui, activer",
+    "passive_mining_update_failed": "Impossible de mettre à jour l'extraction continue"
   }
 }
 </i18n>
diff --git a/frontend/src/components/mining/stepper-panels/mine/MinePanel.vue b/frontend/src/components/mining/stepper-panels/mine/MinePanel.vue
index 48cbc4bcd..7daae4857 100644
--- a/frontend/src/components/mining/stepper-panels/mine/MinePanel.vue
+++ b/frontend/src/components/mining/stepper-panels/mine/MinePanel.vue
@@ -47,8 +47,10 @@
       v-if="!$leadminerStore.activeMiningTask"
       id="mine-stepper-start-button"
       :disabled="
+        (sourceType === 'email' && $leadminerStore.isLoadingBoxes) ||
         (sourceType === 'email' &&
-          ($leadminerStore.isLoadingBoxes || totalEmails === 0)) ||
+          totalEmails === 0 &&
+          !$leadminerStore.googleContactsSyncEnabled) ||
         $leadminerStore.isLoadingStartMining
       "
       :loading="$leadminerStore.isLoadingStartMining"
@@ -397,11 +399,12 @@ function openMiningSettings() {
 }
 
 async function startMiningBoxes() {
-  if (
+  const hasCheckedBoxes =
     Object.keys(selectedBoxes.value).filter(
       (key) => selectedBoxes.value[key].checked && key !== '',
-    ).length === 0
-  ) {
+    ).length > 0;
+
+  if (!hasCheckedBoxes && !$leadminerStore.googleContactsSyncEnabled) {
     openMiningSettings();
     $toast.add({
       severity: 'error',
diff --git a/frontend/src/components/senders/EmailSenderManagement.vue b/frontend/src/components/senders/EmailSenderManagement.vue
index aac0a3e94..8a52aa8a9 100644
--- a/frontend/src/components/senders/EmailSenderManagement.vue
+++ b/frontend/src/components/senders/EmailSenderManagement.vue
@@ -7,6 +7,10 @@ import { useSmtpSendersStore } from '~/stores/smtp-senders';
 import AddEmailSenderDialog from './AddEmailSenderDialog.vue';
 import type { SmtpSender } from '@/types/smtp-senders';
 
+defineProps<{
+  hideAddButton?: boolean;
+}>();
+
 const { t } = useI18n({ useScope: 'local' });
 const { t: globalT } = useI18n({ useScope: 'global' });
 const $confirm = useConfirm();
@@ -22,6 +26,8 @@ function openAddDialog() {
   showAddDialog.value = true;
 }
 
+defineExpose({ openAddDialog });
+
 function openEditDialog(sender: SmtpSender) {
   editingSender.value = sender;
   showAddDialog.value = true;
@@ -86,7 +92,7 @@ onMounted(() => {
 
 <template>
   <div class="flex flex-col gap-4">
-    <div class="flex items-center justify-end">
+    <div v-if="!hideAddButton" class="flex items-center justify-end">
       <Button
         :label="t('add_email_sender')"
         icon="pi pi-plus"
diff --git a/frontend/src/components/sms-fleet/SmsFleetManagement.vue b/frontend/src/components/sms-fleet/SmsFleetManagement.vue
index cb88637a9..a00cb3df0 100644
--- a/frontend/src/components/sms-fleet/SmsFleetManagement.vue
+++ b/frontend/src/components/sms-fleet/SmsFleetManagement.vue
@@ -20,6 +20,7 @@ type SupportedProvider = 'smsgate' | 'simple-sms-gateway';
 
 const props = defineProps<{
   autoAdd?: boolean;
+  hideAddButton?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -212,11 +213,13 @@ function getProviderLabel(provider: SmsGatewayProvider): string {
 onMounted(() => {
   $smsFleetStore.fetchGateways();
 });
+
+defineExpose({ openAddDialog });
 </script>
 
 <template>
   <div class="flex flex-col gap-4">
-    <div class="flex items-center justify-end">
+    <div v-if="!hideAddButton" class="flex items-center justify-end">
       <Button
         :label="t('add_gateway')"
         icon="pi pi-plus"
diff --git a/frontend/src/pages/campaigns.vue b/frontend/src/pages/campaigns.vue
index cc1b27a14..82ab380bf 100644
--- a/frontend/src/pages/campaigns.vue
+++ b/frontend/src/pages/campaigns.vue
@@ -2,16 +2,34 @@
   <div class="flex flex-col gap-4">
     <Panel toggleable class="border border-surface-200 rounded-md p-4">
       <template #header>
-        <div class="flex items-center gap-4 w-full">
-          <h1 class="text-xl font-semibold">{{ t('senders') }}</h1>
-          <SenderFilterTabs v-model="senderFilter" />
+        <div class="flex items-center justify-between gap-4 w-full">
+          <div class="flex items-center gap-4">
+            <h1 class="text-xl font-semibold">{{ t('senders') }}</h1>
+            <SenderFilterTabs v-model="senderFilter" />
+          </div>
+          <div class="flex items-center gap-2">
+            <Button
+              v-if="senderFilter !== 'sms'"
+              :label="t('add_email_sender')"
+              icon="pi pi-plus"
+              outlined
+              @click.stop="emailSenderManagementRef?.openAddDialog()"
+            />
+            <Button
+              v-if="senderFilter !== 'email'"
+              :label="t('add_sms_gateway')"
+              icon="pi pi-plus"
+              outlined
+              @click.stop="smsFleetManagementRef?.openAddDialog()"
+            />
+          </div>
         </div>
       </template>
       <div v-show="senderFilter !== 'sms'">
-        <EmailSenderManagement />
+        <EmailSenderManagement ref="emailSenderManagementRef" hide-add-button />
       </div>
       <div v-show="senderFilter !== 'email'">
-        <SmsFleetManagement />
+        <SmsFleetManagement ref="smsFleetManagementRef" hide-add-button />
       </div>
     </Panel>
 
@@ -395,6 +413,12 @@ import type { SenderFilter } from '~/components/senders/SenderFilterTabs.vue';
 const $campaignsStore = useCampaignsStore();
 const senderFilter = ref<SenderFilter>('all');
 const campaignFilter = ref<SenderFilter>('all');
+const emailSenderManagementRef = ref<InstanceType<
+  typeof EmailSenderManagement
+> | null>(null);
+const smsFleetManagementRef = ref<InstanceType<
+  typeof SmsFleetManagement
+> | null>(null);
 
 const filteredCampaigns = computed(() => {
   if (campaignFilter.value === 'all') return $campaignsStore.campaigns;
@@ -767,6 +791,8 @@ onBeforeUnmount(() => {
   "en": {
     "sms_gateways": "SMS Gateways",
     "senders": "Senders",
+    "add_email_sender": "Add Email Sender",
+    "add_sms_gateway": "Add SMS Gateway",
     "campaigns": "Campaigns",
     "refresh": "Refresh",
     "no_campaigns": "No campaigns yet",
@@ -828,6 +854,8 @@ onBeforeUnmount(() => {
   "fr": {
     "sms_gateways": "Passerelles SMS",
     "senders": "Expéditeurs",
+    "add_email_sender": "Ajouter un expéditeur email",
+    "add_sms_gateway": "Ajouter une passerelle SMS",
     "campaigns": "Campagnes",
     "refresh": "Rafraîchir",
     "no_campaigns": "Aucune campagne",
diff --git a/supabase/migrations/20260530120000_add_smtp_senders.sql b/supabase/migrations/20260530120000_add_smtp_senders.sql
index f3fa73c41..faa0c4fd4 100644
--- a/supabase/migrations/20260530120000_add_smtp_senders.sql
+++ b/supabase/migrations/20260530120000_add_smtp_senders.sql
@@ -26,3 +26,41 @@ CREATE POLICY "Users can manage own smtp_senders"
   ON private.smtp_senders
   USING (auth.uid() = user_id)
   WITH CHECK (auth.uid() = user_id);
+
+-- Backfill smtp_senders for existing OAuth mining sources (Google / Azure).
+-- The oauth_refresh_token is left NULL; the backend resolves the token from
+-- the linked mining_sources row (via mining_source_email) at send time.
+INSERT INTO private.smtp_senders (
+  user_id,
+  name,
+  email,
+  smtp_host,
+  smtp_port,
+  smtp_encryption,
+  smtp_user,
+  auth_type,
+  oauth_provider,
+  active,
+  mining_source_email
+)
+SELECT
+  ms.user_id,
+  CASE
+    WHEN ms.type = 'google' THEN 'Gmail (' || ms.email || ')'
+    WHEN ms.type = 'azure'  THEN 'Outlook (' || ms.email || ')'
+  END,
+  ms.email,
+  CASE
+    WHEN ms.type = 'google' THEN 'smtp.gmail.com'
+    WHEN ms.type = 'azure'  THEN 'smtp-mail.outlook.com'
+  END,
+  587,
+  'starttls',
+  ms.email,
+  'oauth',
+  ms.type,
+  TRUE,
+  ms.email
+FROM private.mining_sources ms
+WHERE ms.type IN ('google', 'azure')
+ON CONFLICT (user_id, email) DO NOTHING;