diff --git a/frontend/src/components/admin/imap_migration/ProviderForm.vue b/frontend/src/components/admin/imap_migration/ProviderForm.vue
index 50ff2e246..218570df8 100644
--- a/frontend/src/components/admin/imap_migration/ProviderForm.vue
+++ b/frontend/src/components/admin/imap_migration/ProviderForm.vue
@@ -127,9 +127,12 @@ async function save() {
     data.domains = []
     for (const domain of editedProvider.value.domains) {
       if (domain.new_domain) {
+        const newDomain = Number.isInteger(domain.new_domain)
+          ? domain.new_domain
+          : domain.new_domain.pk
         data.domains.push({
           name: domain.name,
-          new_domain: domain.new_domain.pk || domain.new_domain.id,
+          new_domain: newDomain,
         })
       } else {
         data.domains.push(domain)
diff --git a/frontend/src/components/admin/imap_migration/ProvidersList.vue b/frontend/src/components/admin/imap_migration/ProvidersList.vue
index 006d36373..897cbda0c 100644
--- a/frontend/src/components/admin/imap_migration/ProvidersList.vue
+++ b/frontend/src/components/admin/imap_migration/ProvidersList.vue
@@ -67,7 +67,11 @@
       <template #[`expanded-row`]="{ columns, item }">
         <tr>
           <td :colspan="columns.length">
-            <v-chip v-for="(domain, index) in item.domains" :key="index">
+            <v-chip
+              v-for="(domain, index) in item.domains"
+              :key="index"
+              class="mr-2"
+            >
               <template v-if="domain.new_domain">
                 {{ domain.name }} -->
                 {{ domainsStore.getDomainName(domain.new_domain) }}
diff --git a/frontend/src/components/admin/imap_migration/form_steps/ProviderAssociatedForm.vue b/frontend/src/components/admin/imap_migration/form_steps/ProviderAssociatedForm.vue
index 62a8087c6..37e0535f4 100644
--- a/frontend/src/components/admin/imap_migration/form_steps/ProviderAssociatedForm.vue
+++ b/frontend/src/components/admin/imap_migration/form_steps/ProviderAssociatedForm.vue
@@ -24,7 +24,7 @@
   <v-spacer />
   <v-chip
     v-for="(domain, index) in domains"
-    :key="index"
+    :key="domain"
     class="mr-2 mt-2"
     closable
     @click:close="removeDomain(index)"