diff --git a/src/views/OAuth2CallbackView.vue b/src/views/OAuth2CallbackView.vue
index 70fa7cf..d7356dd 100644
--- a/src/views/OAuth2CallbackView.vue
+++ b/src/views/OAuth2CallbackView.vue
@@ -69,6 +69,10 @@ onMounted(async () => {
   }
 
   notifyParent()
+
+  if (status.value === 'success' && window.opener) {
+    setTimeout(() => window.close(), 1500)
+  }
 })
 
 function handleClose() {
diff --git a/src/views/administration/ProviderEditView.vue b/src/views/administration/ProviderEditView.vue
index 5c2c166..4b10914 100644
--- a/src/views/administration/ProviderEditView.vue
+++ b/src/views/administration/ProviderEditView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, computed, watch, nextTick } from 'vue'
+import { ref, onMounted, onUnmounted, computed, watch, nextTick } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useProvidersStore, useProviderCatalogStore } from '@/stores'
 import { ArrowLeft, Save, Check } from 'lucide-vue-next'
@@ -185,12 +185,28 @@ onMounted(async () => {
       console.error('Failed to load provider catalog:', err)
     }
   }
-  
+
   if (isEditMode.value) {
     await loadProvider()
   }
 })
 
+const handleOAuth2Message = async (event: MessageEvent) => {
+  if (event.origin !== window.location.origin) return
+  if (event.data?.source !== 'oauth2-callback') return
+  if (event.data.success && isEditMode.value) {
+    await loadProvider()
+  }
+}
+
+onMounted(() => {
+  window.addEventListener('message', handleOAuth2Message)
+})
+
+onUnmounted(() => {
+  window.removeEventListener('message', handleOAuth2Message)
+})
+
 // Methods
 async function loadProvider() {
   if (!providerId.value) return
diff --git a/src/views/administration/provider-configuration/SmtpImapChannelConfig.vue b/src/views/administration/provider-configuration/SmtpImapChannelConfig.vue
index ac7acb4..9a4b900 100644
--- a/src/views/administration/provider-configuration/SmtpImapChannelConfig.vue
+++ b/src/views/administration/provider-configuration/SmtpImapChannelConfig.vue
@@ -45,7 +45,7 @@ const tokenExpiryRelative = computed(() => {
 
 function getRedirectUrl(): string {
   const baseUrl = (import.meta.env.VITE_API_BASE_URL || window.location.origin).replace(/\/+$/, '')
-  return `${baseUrl}/api/email/smtp-imap/oauth2/callback`
+  return `${baseUrl}/oauth2/callback`
 }
 
 async function handleOAuth2Authorize() {