From fd8f3bf702fdd004853b2cd86462a2f2d565357e Mon Sep 17 00:00:00 2001
From: Adrien P <dev@asdrip.fr>
Date: Thu, 24 Jul 2025 19:45:22 +0200
Subject: [PATCH 1/8] fixed docker not launching

---
 modoboa/core/migrations/0004_auto_20150728_1228.py   | 10 ++++++----
 ...ser_email_is_active_core_user_email_c0c03f_idx.py | 12 +++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modoboa/core/migrations/0004_auto_20150728_1228.py b/modoboa/core/migrations/0004_auto_20150728_1228.py
index a7fa76773..cee67bfe9 100644
--- a/modoboa/core/migrations/0004_auto_20150728_1228.py
+++ b/modoboa/core/migrations/0004_auto_20150728_1228.py
@@ -2,7 +2,6 @@ from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0003_user_master_user"),
     ]
@@ -42,8 +41,11 @@ class Migration(migrations.Migration):
             ),
             preserve_default=True,
         ),
-        migrations.AlterIndexTogether(
-            name="user",
-            index_together=set([("email", "is_active")]),
+        migrations.AddConstraint(
+            model_name="user",
+            constraint=models.UniqueConstraint(
+                fields=("email", "is_active"),
+                name="core_user_email_c0c03f_idx",
+            ),
         ),
     ]
diff --git a/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py b/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py
index a001c7257..b9538e836 100644
--- a/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py
+++ b/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py
@@ -2,6 +2,8 @@
 
 from django.db import migrations
 
+# Due to a bug, this migration has been changed...
+
 
 class Migration(migrations.Migration):
     dependencies = [
@@ -9,9 +11,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RenameIndex(
-            model_name="user",
-            new_name="core_user_email_c0c03f_idx",
-            old_fields=("email", "is_active"),
-        ),
+        # migrations.RenameIndex(
+        #     model_name="user",
+        #     new_name="core_user_email_c0c03f_idx",
+        #     old_fields=("email", "is_active"),
+        # ),
     ]

From 667ba6096cdb40d6224d85ebe12776471af69fcf Mon Sep 17 00:00:00 2001
From: Adrien P <dev@asdrip.fr>
Date: Thu, 24 Jul 2025 19:45:40 +0200
Subject: [PATCH 2/8] Fixed dev mode for load_initial_data

---
 modoboa/core/management/commands/load_initial_data.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modoboa/core/management/commands/load_initial_data.py b/modoboa/core/management/commands/load_initial_data.py
index c18887f3e..9c04cd974 100644
--- a/modoboa/core/management/commands/load_initial_data.py
+++ b/modoboa/core/management/commands/load_initial_data.py
@@ -122,7 +122,9 @@ class Command(BaseCommand):
         if not frontend_application.exists():
             if options["dev"]:
                 base_uri = "https://localhost:3000/"
+                base_uris = base_uri
                 redirect_uri = "https://localhost:3000/login/logged"
+                redirect_uris = redirect_uri
                 client_id = "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD"
             else:
                 client_id = str(uuid.uuid4())

From df490d9ca4428337341baf6ac974ee336fbaa60e Mon Sep 17 00:00:00 2001
From: Adrien P <dev@asdrip.fr>
Date: Thu, 24 Jul 2025 23:54:35 +0200
Subject: [PATCH 3/8] Separated aliases and accounts in identities

---
 frontend/src/api/accounts.js                  |   3 +
 frontend/src/api/aliases.js                   |   4 +-
 .../src/components/admin/alarms/AlarmList.vue |   2 +-
 .../admin/identities/IdentityList.vue         | 217 ++++++++++++++++--
 modoboa/admin/api/v2/viewsets.py              |  15 +-
 5 files changed, 215 insertions(+), 26 deletions(-)

diff --git a/frontend/src/api/accounts.js b/frontend/src/api/accounts.js
index 13113435d..f04404445 100644
--- a/frontend/src/api/accounts.js
+++ b/frontend/src/api/accounts.js
@@ -11,6 +11,9 @@ export default {
       },
     })
   },
+  getAllParams(params) {
+    return repository.get(`${resource}/`, { params })
+  },
   get(accountId) {
     return repository.get(`${resource}/${accountId}/`)
   },
diff --git a/frontend/src/api/aliases.js b/frontend/src/api/aliases.js
index fea9bb285..0ed1993d7 100644
--- a/frontend/src/api/aliases.js
+++ b/frontend/src/api/aliases.js
@@ -3,8 +3,8 @@ import repository from './repository'
 const resource = 'aliases'
 
 export default {
-  getAll() {
-    return repository.get(`${resource}/`)
+  getAll(params) {
+    return repository.get(`${resource}/`, { params })
   },
   get(aliasId) {
     return repository.get(`${resource}/${aliasId}/`)
diff --git a/frontend/src/components/admin/alarms/AlarmList.vue b/frontend/src/components/admin/alarms/AlarmList.vue
index cb2a56bd6..86a78e101 100644
--- a/frontend/src/components/admin/alarms/AlarmList.vue
+++ b/frontend/src/components/admin/alarms/AlarmList.vue
@@ -17,7 +17,7 @@
           <v-text-field
             v-model="search"
             prepend-inner-icon="mdi-magnify"
-            placeholder="Search"
+            :placeholder="$gettext('Search')"
             density="compact"
             variant="outlined"
             hide-details
diff --git a/frontend/src/components/admin/identities/IdentityList.vue b/frontend/src/components/admin/identities/IdentityList.vue
index acca12dfb..3e2f91ebe 100644
--- a/frontend/src/components/admin/identities/IdentityList.vue
+++ b/frontend/src/components/admin/identities/IdentityList.vue
@@ -1,14 +1,19 @@
 <template>
   <v-card class="mt-6">
-    <v-data-table
+    <v-data-table-server
       v-model="selected"
       :headers="headers"
       :items="identities"
       :search="search"
       :loading="loading"
-      item-value="identity"
-      class="elevation-0"
+      :items-length="totalIdentities"
+      :page="currentPage"
+      :items-per-page="itemsPerPageR"
+      item-value="key"
+      elevation="0"
       show-select
+      :sort-by="sortByR"
+      @update:options="updatedOptions"
     >
       <template #top>
         <v-toolbar flat color="white">
@@ -44,11 +49,35 @@
             icon="mdi-reload"
             @click="fetchIdentities"
           ></v-btn>
+          <v-radio-group
+            v-model="identityType"
+            inline
+            @update:model-value="updateType"
+            :readonly="loading"
+          >
+            <v-radio
+              color="primary"
+              :label="$gettext('Accounts')"
+              value="account"
+            ></v-radio>
+            <v-radio
+              color="primary"
+              :label="$gettext('Alias')"
+              value="alias"
+            ></v-radio>
+          </v-radio-group>
+          <v-combobox
+            v-model="columns"
+            :items="currentAvailableColumns"
+            multiple
+            return-object
+          >
+          </v-combobox>
           <v-spacer></v-spacer>
         </v-toolbar>
       </template>
       <template #[`item.identity`]="{ item }">
-        <template v-if="item.type === 'account'">
+        <template v-if="identityType === 'account'">
           <router-link :to="{ name: 'AccountDetail', params: { id: item.pk } }">
             {{ item.identity }}
           </router-link>
@@ -99,7 +128,7 @@
           <MenuItems :items="getMenuItems(item)" :obj="item" />
         </v-menu>
       </template>
-    </v-data-table>
+    </v-data-table-server>
     <ConfirmDialog ref="confirmAlias" />
     <ConfirmDialog ref="confirmAccount">
       <v-checkbox
@@ -112,7 +141,7 @@
 </template>
 
 <script setup lang="js">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import MenuItems from '@/components/tools/MenuItems.vue'
 import ConfirmDialog from '@/components/tools/ConfirmDialog.vue'
@@ -120,25 +149,109 @@ import { useRouter } from 'vue-router'
 import { useBusStore } from '@/stores'
 import accountsApi from '@/api/accounts'
 import aliasesApi from '@/api/aliases'
-import identitiesApi from '@/api/identities'
+import debounce from 'debounce'
+// import identitiesApi from '@/api/identities'
 
 const { $gettext, $pgettext } = useGettext()
 const router = useRouter()
 const { displayNotification } = useBusStore()
 
-const headers = ref([
-  { title: $gettext('Name'), key: 'identity' },
-  { title: $pgettext('female', 'Enabled'), key: 'enabled', width: '5%' },
-  { title: $gettext('Fullname/recipient'), key: 'name_or_rcpt' },
-  { title: $gettext('Tags'), key: 'tags' },
-  {
-    title: $gettext('Actions'),
-    key: 'actions',
-    sortable: false,
-    align: 'end',
+const availableAliasesColumns = {
+  address: { title: $gettext('Address'), key: 'address', value: 'address' },
+  enabled: { title: $gettext('Enabled'), key: 'enabled', value: 'enabled' },
+  recipients: {
+    title: $gettext('Recipients'),
+    key: 'recipients',
+    value: 'recipients',
   },
-])
+  expire_at: {
+    title: $gettext('Expire at'),
+    key: 'expire_at',
+    value: 'expire_at',
+  },
+  description: {
+    title: $gettext('Description'),
+    key: 'description',
+    value: 'description',
+  },
+  creation: {
+    title: $gettext('Creation date'),
+    key: 'creation',
+    value: 'creation',
+  },
+  last_modification: {
+    title: $gettext('Last modification'),
+    key: 'last_modification',
+    value: 'last_modification',
+  },
+}
 
+const defaultAliasColumns = [
+  availableAliasesColumns.address,
+  availableAliasesColumns.enabled,
+  availableAliasesColumns.recipients,
+]
+
+const availableAccountsColumns = {
+  username: { title: $gettext('Name'), key: 'username', value: 'username' },
+  first_name: {
+    title: $gettext('First name'),
+    key: 'first_name',
+    value: 'first_name',
+  },
+  last_name: {
+    title: $gettext('Last Name'),
+    key: 'last_name',
+    value: 'last_name',
+  },
+  is_active: { title: $gettext('Enabled'), key: 'enabled', value: 'is_active' },
+  role: { title: $gettext('Role'), key: 'role', value: 'role' },
+  language: { title: $gettext('Language'), key: 'language', value: 'language' },
+  phone_number: {
+    title: $gettext('Phone number'),
+    key: 'phone_number',
+    value: 'phone_number',
+  },
+  secondary_email: {
+    title: $gettext('Secondary email'),
+    key: 'secondary_email',
+    value: 'secondary_email',
+  },
+  tfa_enabled: {
+    title: $gettext('TFA enabled'),
+    key: 'tfa_enabled',
+    value: 'tfa_enabled',
+  },
+  totp_enabled: {
+    title: $gettext('TOTP enabled'),
+    key: 'totp_enabled',
+    value: 'totp_enabled',
+  },
+  webauth_enabled: {
+    title: $gettext('WebAutn enabled'),
+    key: 'webauth_enabled',
+    value: 'webauth_enabled',
+  },
+  date_joined: {
+    title: $gettext('Created date'),
+    key: 'date_joined',
+    value: 'date_joined',
+  },
+  last_login: {
+    title: $gettext('Last login'),
+    key: 'last_login',
+    value: 'last_login',
+  },
+}
+
+const defaultAccountsColumns = [
+  availableAccountsColumns.username,
+  availableAccountsColumns.is_active,
+  availableAccountsColumns.role,
+]
+
+const identityType = ref('account')
+const totalIdentities = ref(0)
 const identities = ref([])
 const loading = ref(false)
 const search = ref('')
@@ -146,12 +259,70 @@ const selected = ref([])
 const keepAccountFolder = ref(false)
 const confirmAlias = ref()
 const confirmAccount = ref()
+const currentPage = ref(1)
+const itemsPerPageR = ref(10)
+const sortByR = ref([])
+const columns = ref(defaultAccountsColumns)
+
+const headers = computed(() => {
+  const result = columns.value
+  return result.concat([
+    {
+      title: $gettext('Actions'),
+      key: 'actions',
+      sortable: false,
+      align: 'end',
+    },
+  ])
+})
+
+const currentAvailableColumns = computed(() => {
+  if (identityType.value === 'account') {
+    return Object.values(availableAccountsColumns)
+  } else {
+    return Object.values(availableAliasesColumns)
+  }
+})
+
+async function updateType(value) {
+  loading.value = true
+  sortByR.value = []
+  if (value === 'account') {
+    columns.value = defaultAccountsColumns
+  } else {
+    columns.value = defaultAliasColumns
+  }
+  fetchIdentities()
+}
+
+async function updatedOptions({ page, itemsPerPage, sortBy }) {
+  currentPage.value = page
+  itemsPerPageR.value = itemsPerPage
+  sortByR.value = sortBy
+  fetchIdentities()
+}
 
 async function fetchIdentities() {
   loading.value = true
+  const params = {
+    page: currentPage.value || 1,
+    page_size: itemsPerPageR.value || 10,
+  }
+  if (sortByR.value && sortByR.value.length) {
+    params.ordering = sortByR.value
+      .map((item) => (item.order !== 'asc' ? `-${item.key}` : item.key))
+      .join(',')
+  }
+  if (search.value !== '') {
+    params.search = search.value
+  }
   try {
-    const resp = await identitiesApi.getAll()
-    identities.value = resp.data
+    const resp =
+      identityType.value === 'account'
+        ? await accountsApi.getAllParams(params)
+        : await aliasesApi.getAll(params)
+    identities.value = resp.data.results
+    totalIdentities.value = resp.data.count
     selected.value = []
   } finally {
     loading.value = false
@@ -160,7 +331,7 @@ async function fetchIdentities() {
 
 function getMenuItems(item) {
   const result = []
-  if (item.type === 'account') {
+  if (identityType === 'account') {
     item.possible_actions.forEach((element) => {
       result.push({
         label: element.label,
@@ -184,7 +355,7 @@ function getMenuItems(item) {
       onClick: deleteAccount,
       color: 'red',
     })
-  } else if (item.type === 'alias') {
+  } else if (identityType === 'alias') {
     result.push({
       label: $gettext('Edit'),
       icon: 'mdi-circle-edit-outline',
@@ -275,4 +446,6 @@ onMounted(() => {
 defineExpose({
   fetchIdentities,
 })
+
+fetchIdentities = debounce(fetchIdentities, 500)
 </script>
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index fa2460735..702440aa9 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -168,7 +168,13 @@ class AccountFilterSet(dj_filters.FilterSet):
 class AccountViewSet(v1_viewsets.AccountViewSet):
     """ViewSet for User/Mailbox."""
 
-    filter_backends = (filters.SearchFilter, dj_filters.DjangoFilterBackend)
+    filter_backends = (
+        filters.OrderingFilter,
+        filters.SearchFilter,
+        dj_filters.DjangoFilterBackend,
+    )
+    search_fields = ["^first_name", "^last_name", "^email", "username"]
+    pagination_class = pagination.CustomPageNumberPagination
     filterset_class = AccountFilterSet
 
     def get_serializer_class(self):
@@ -258,6 +264,13 @@ class IdentityViewSet(GetThrottleViewsetMixin, viewsets.ViewSet):
 class AliasViewSet(v1_viewsets.AliasViewSet):
     """Viewset for Alias."""
 
+    filter_backends = (
+        filters.OrderingFilter,
+        filters.SearchFilter,
+        dj_filters.DjangoFilterBackend,
+    )
+    pagination_class = pagination.CustomPageNumberPagination
+    search_fields = ["address"]
     serializer_class = serializers.AliasSerializer
 
     @action(methods=["post"], detail=False)

From ade5461f5238cc2b89a6a74a045a7b23e5afbe6f Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 25 Jul 2025 12:01:09 +0200
Subject: [PATCH 4/8] Frontend update

---
 .../components/admin/domains/DomainList.vue   |  11 +-
 .../admin/identities/IdentityList.vue         | 177 +++++++++++-------
 .../components/tools/ChooseColumnsForm.vue    |  43 +++++
 modoboa/admin/api/v2/serializers.py           |  19 +-
 4 files changed, 177 insertions(+), 73 deletions(-)
 create mode 100644 frontend/src/components/tools/ChooseColumnsForm.vue

diff --git a/frontend/src/components/admin/domains/DomainList.vue b/frontend/src/components/admin/domains/DomainList.vue
index 8054267bc..959bd4c34 100644
--- a/frontend/src/components/admin/domains/DomainList.vue
+++ b/frontend/src/components/admin/domains/DomainList.vue
@@ -348,11 +348,20 @@ defineExpose({
 })
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .v-text-field--outlined :deep(fieldset) {
   border-color: #bfc5d2;
 }
 .v-input--checkbox :deep(.v-label) {
   font-size: 0.875rem !important;
 }
+
+a {
+  text-decoration: none;
+  color: rgb(var(--v-theme-primary));
+
+  &:visited {
+    color: rgb(var(--v-theme-primary));
+  }
+}
 </style>
diff --git a/frontend/src/components/admin/identities/IdentityList.vue b/frontend/src/components/admin/identities/IdentityList.vue
index 3e2f91ebe..d0f358a3b 100644
--- a/frontend/src/components/admin/identities/IdentityList.vue
+++ b/frontend/src/components/admin/identities/IdentityList.vue
@@ -29,6 +29,12 @@
             class="flex-grow-0 w-33 mr-4"
           ></v-text-field>
           <slot name="extraActions" />
+          <v-btn
+            variant="text"
+            icon="mdi-format-columns"
+            :title="$gettext('Customize displayed columns')"
+            @click="showColumnsForm = true"
+          ></v-btn>
           <v-menu location="bottom">
             <template #activator="{ props }">
               <v-btn
@@ -49,44 +55,45 @@
             icon="mdi-reload"
             @click="fetchIdentities"
           ></v-btn>
-          <v-radio-group
-            v-model="identityType"
-            inline
-            @update:model-value="updateType"
-            :readonly="loading"
-          >
-            <v-radio
-              color="primary"
-              :label="$gettext('Accounts')"
-              value="account"
-            ></v-radio>
-            <v-radio
-              color="primary"
-              :label="$gettext('Alias')"
-              value="alias"
-            ></v-radio>
-          </v-radio-group>
-          <v-combobox
-            v-model="columns"
-            :items="currentAvailableColumns"
-            multiple
-            return-object
-          >
-          </v-combobox>
-          <v-spacer></v-spacer>
+
+          <template #extension>
+            <v-radio-group
+              v-model="identityType"
+              inline
+              :readonly="loading"
+              hide-details
+              @update:model-value="updateType"
+            >
+              <v-radio
+                color="primary"
+                :label="$gettext('Accounts')"
+                value="account"
+              ></v-radio>
+              <v-radio
+                color="primary"
+                :label="$gettext('Alias')"
+                value="alias"
+              ></v-radio>
+            </v-radio-group>
+          </template>
         </v-toolbar>
       </template>
-      <template #[`item.identity`]="{ item }">
-        <template v-if="identityType === 'account'">
-          <router-link :to="{ name: 'AccountDetail', params: { id: item.pk } }">
-            {{ item.identity }}
-          </router-link>
-        </template>
-        <template v-else>
-          <router-link :to="{ name: 'AliasDetail', params: { id: item.pk } }">
-            {{ item.identity }}
-          </router-link>
-        </template>
+      <template #[`item.username`]="{ item }">
+        <router-link :to="{ name: 'AccountDetail', params: { id: item.pk } }">
+          {{ item.username }}
+        </router-link>
+      </template>
+      <template #[`item.address`]="{ item }">
+        <router-link :to="{ name: 'AliasDetail', params: { id: item.pk } }">
+          {{ item.address }}
+        </router-link>
+      </template>
+      <template #[`item.is_active`]="{ item }">
+        <v-icon
+          :color="item.is_active ? 'success' : 'error'"
+          :icon="item.is_active ? 'mdi-check-circle' : 'mdi-close-circle'"
+          variant="flat"
+        />
       </template>
       <template #[`item.enabled`]="{ item }">
         <v-icon
@@ -95,15 +102,24 @@
           variant="flat"
         />
       </template>
-      <template #[`item.tags`]="{ item }">
-        <v-chip
-          v-for="(tag, index) in item.tags"
-          :key="tag.name"
-          :color="tag.type !== 'idt' ? 'primary' : 'default'"
-          :class="index > 0 ? 'ml-2' : ''"
-          size="small"
-        >
-          {{ tag.label }}
+      <template #[`item.recipients`]="{ item }">
+        {{ displayRecipients(item) }}
+      </template>
+      <template #[`item.date_joined`]="{ item }">
+        {{ $date(item.date_joined) }}
+      </template>
+      <template #[`item.creation`]="{ item }">
+        {{ $date(item.creation) }}
+      </template>
+      <template #[`item.last_modification`]="{ item }">
+        {{ $date(item.last_modification) }}
+      </template>
+      <template #[`item.last_login`]="{ item }">
+        {{ $date(item.last_login) }}
+      </template>
+      <template #[`item.role`]="{ item }">
+        <v-chip color="default" size="small">
+          {{ item.role }}
         </v-chip>
       </template>
       <template #[`item.actions`]="{ item }">
@@ -137,6 +153,13 @@
         hide-details
       />
     </ConfirmDialog>
+    <v-dialog v-model="showColumnsForm" max-width="500">
+      <ChooseColumnsForm
+        :columns="columns"
+        :available-columns="currentAvailableColumns"
+        @apply="updateDisplayedColumns"
+      />
+    </v-dialog>
   </v-card>
 </template>
 
@@ -145,44 +168,39 @@ import { ref, onMounted, computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import MenuItems from '@/components/tools/MenuItems.vue'
 import ConfirmDialog from '@/components/tools/ConfirmDialog.vue'
+import ChooseColumnsForm from '@/components/tools/ChooseColumnsForm.vue'
 import { useRouter } from 'vue-router'
 import { useBusStore } from '@/stores'
 import accountsApi from '@/api/accounts'
 import aliasesApi from '@/api/aliases'
 import debounce from 'debounce'
-// import identitiesApi from '@/api/identities'
 
-const { $gettext, $pgettext } = useGettext()
+const { $gettext } = useGettext()
 const router = useRouter()
 const { displayNotification } = useBusStore()
 
 const availableAliasesColumns = {
-  address: { title: $gettext('Address'), key: 'address', value: 'address' },
-  enabled: { title: $gettext('Enabled'), key: 'enabled', value: 'enabled' },
+  address: { title: $gettext('Address'), key: 'address' },
+  enabled: { title: $gettext('Enabled'), key: 'enabled' },
   recipients: {
     title: $gettext('Recipients'),
     key: 'recipients',
-    value: 'recipients',
   },
   expire_at: {
     title: $gettext('Expire at'),
     key: 'expire_at',
-    value: 'expire_at',
   },
   description: {
     title: $gettext('Description'),
     key: 'description',
-    value: 'description',
   },
   creation: {
     title: $gettext('Creation date'),
     key: 'creation',
-    value: 'creation',
   },
   last_modification: {
     title: $gettext('Last modification'),
     key: 'last_modification',
-    value: 'last_modification',
   },
 }
 
@@ -193,54 +211,45 @@ const defaultAliasColumns = [
 ]
 
 const availableAccountsColumns = {
-  username: { title: $gettext('Name'), key: 'username', value: 'username' },
+  username: { title: $gettext('Name'), key: 'username' },
   first_name: {
     title: $gettext('First name'),
     key: 'first_name',
-    value: 'first_name',
   },
   last_name: {
     title: $gettext('Last Name'),
     key: 'last_name',
-    value: 'last_name',
   },
-  is_active: { title: $gettext('Enabled'), key: 'enabled', value: 'is_active' },
-  role: { title: $gettext('Role'), key: 'role', value: 'role' },
-  language: { title: $gettext('Language'), key: 'language', value: 'language' },
+  is_active: { title: $gettext('Enabled'), key: 'is_active' },
+  role: { title: $gettext('Role'), key: 'role' },
+  language: { title: $gettext('Language'), key: 'language' },
   phone_number: {
     title: $gettext('Phone number'),
     key: 'phone_number',
-    value: 'phone_number',
   },
   secondary_email: {
     title: $gettext('Secondary email'),
     key: 'secondary_email',
-    value: 'secondary_email',
   },
   tfa_enabled: {
     title: $gettext('TFA enabled'),
     key: 'tfa_enabled',
-    value: 'tfa_enabled',
   },
   totp_enabled: {
     title: $gettext('TOTP enabled'),
     key: 'totp_enabled',
-    value: 'totp_enabled',
   },
   webauth_enabled: {
     title: $gettext('WebAutn enabled'),
     key: 'webauth_enabled',
-    value: 'webauth_enabled',
   },
   date_joined: {
-    title: $gettext('Created date'),
+    title: $gettext('Creation date'),
     key: 'date_joined',
-    value: 'date_joined',
   },
   last_login: {
     title: $gettext('Last login'),
     key: 'last_login',
-    value: 'last_login',
   },
 }
 
@@ -263,6 +272,7 @@ const currentPage = ref(1)
 const itemsPerPageR = ref(10)
 const sortByR = ref([])
 const columns = ref(defaultAccountsColumns)
+const showColumnsForm = ref(false)
 
 const headers = computed(() => {
   const result = columns.value
@@ -292,7 +302,7 @@ async function updateType(value) {
   } else {
     columns.value = defaultAliasColumns
   }
-  fetchIdentities()
+  await fetchIdentities()
 }
 
 async function updatedOptions({ page, itemsPerPage, sortBy }) {
@@ -329,9 +339,16 @@ async function fetchIdentities() {
   }
 }
 
+function updateDisplayedColumns(selection) {
+  columns.value = currentAvailableColumns.value.filter((col) =>
+    selection.includes(col.key)
+  )
+  showColumnsForm.value = false
+}
+
 function getMenuItems(item) {
   const result = []
-  if (identityType === 'account') {
+  if (identityType.value === 'account') {
     item.possible_actions.forEach((element) => {
       result.push({
         label: element.label,
@@ -355,7 +372,7 @@ function getMenuItems(item) {
       onClick: deleteAccount,
       color: 'red',
     })
-  } else if (identityType === 'alias') {
+  } else if (identityType.value === 'alias') {
     result.push({
       label: $gettext('Edit'),
       icon: 'mdi-circle-edit-outline',
@@ -439,6 +456,13 @@ async function deleteAlias(alias) {
   }
 }
 
+function displayRecipients(alias) {
+  if (!alias.recipients) {
+    return ''
+  }
+  return alias.recipients.join(', ')
+}
+
 onMounted(() => {
   fetchIdentities()
 })
@@ -449,3 +473,14 @@ defineExpose({
 
 fetchIdentities = debounce(fetchIdentities, 500)
 </script>
+
+<style scoped lang="scss">
+a {
+  text-decoration: none;
+  color: rgb(var(--v-theme-primary));
+
+  &:visited {
+    color: rgb(var(--v-theme-primary));
+  }
+}
+</style>
diff --git a/frontend/src/components/tools/ChooseColumnsForm.vue b/frontend/src/components/tools/ChooseColumnsForm.vue
new file mode 100644
index 000000000..5dfc206cf
--- /dev/null
+++ b/frontend/src/components/tools/ChooseColumnsForm.vue
@@ -0,0 +1,43 @@
+<template>
+  <v-card :title="$gettext('Choose columns to display')">
+    <v-card-text>
+      <div v-for="column in props.availableColumns" :key="column.key">
+        <v-checkbox
+          v-model="model"
+          :value="column.key"
+          :label="column.title"
+          color="primary"
+          hide-details
+          density="compact"
+        />
+      </div>
+    </v-card-text>
+    <v-card-actions>
+      <v-spacer />
+      <v-btn color="primary" variant="outlined" @click="apply">
+        {{ $gettext('Apply') }}
+      </v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script setup>
+const props = defineProps({
+  availableColumns: {
+    type: Array,
+    default: null,
+  },
+  columns: {
+    type: Array,
+    default: null,
+  },
+})
+const model = defineModel({ type: Array })
+const emit = defineEmits(['apply'])
+
+const apply = () => {
+  emit('apply', model.value)
+}
+
+model.value = props.columns.map((col) => col.key)
+</script>
diff --git a/modoboa/admin/api/v2/serializers.py b/modoboa/admin/api/v2/serializers.py
index 50fb3f38a..b955685e0 100644
--- a/modoboa/admin/api/v2/serializers.py
+++ b/modoboa/admin/api/v2/serializers.py
@@ -402,9 +402,13 @@ class AccountSerializer(v1_serializers.AccountSerializer):
     aliases = serializers.ListField(
         child=lib_fields.DRFEmailFieldUTF8(), source="mailbox.alias_addresses"
     )
+    possible_actions = serializers.SerializerMethodField()
 
     class Meta(v1_serializers.AccountSerializer.Meta):
-        fields = v1_serializers.AccountSerializer.Meta.fields + ("aliases",)
+        fields = v1_serializers.AccountSerializer.Meta.fields + (
+            "aliases",
+            "possible_actions",
+        )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -412,6 +416,19 @@ class AccountSerializer(v1_serializers.AccountSerializer):
             return
         self.fields["resources"] = serializers.SerializerMethodField()
 
+    def get_possible_actions(self, identity) -> list[IdPossibleActionsSerializer]:
+        actions = admin_signals.extra_account_identities_actions.send(
+            self.__class__, account=identity
+        )
+        cleaned_actions = []
+        for action in actions:
+            try:
+                serialized_data = IdPossibleActionsSerializer(action[1]).data
+                cleaned_actions.append(serialized_data)
+            except (ValidationError, AttributeError):
+                continue
+        return cleaned_actions
+
     def get_resources(self, account) -> list[AccountResourceSerializer]:
         if account.role == "SimpleUsers":
             return []

From 15712da0b2bf965b1afa3cfcfa096dcf0547a892 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 25 Jul 2025 12:10:20 +0200
Subject: [PATCH 5/8] Restore migration

---
 ...ser_email_is_active_core_user_email_c0c03f_idx.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py b/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py
index b9538e836..a001c7257 100644
--- a/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py
+++ b/modoboa/core/migrations/0025_rename_user_email_is_active_core_user_email_c0c03f_idx.py
@@ -2,8 +2,6 @@
 
 from django.db import migrations
 
-# Due to a bug, this migration has been changed...
-
 
 class Migration(migrations.Migration):
     dependencies = [
@@ -11,9 +9,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        # migrations.RenameIndex(
-        #     model_name="user",
-        #     new_name="core_user_email_c0c03f_idx",
-        #     old_fields=("email", "is_active"),
-        # ),
+        migrations.RenameIndex(
+            model_name="user",
+            new_name="core_user_email_c0c03f_idx",
+            old_fields=("email", "is_active"),
+        ),
     ]

From e587533cd507a81012d7e7cde6bc0c341355995c Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 25 Jul 2025 12:14:09 +0200
Subject: [PATCH 6/8] Restore migration

---
 modoboa/core/migrations/0004_auto_20150728_1228.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modoboa/core/migrations/0004_auto_20150728_1228.py b/modoboa/core/migrations/0004_auto_20150728_1228.py
index cee67bfe9..a7fa76773 100644
--- a/modoboa/core/migrations/0004_auto_20150728_1228.py
+++ b/modoboa/core/migrations/0004_auto_20150728_1228.py
@@ -2,6 +2,7 @@ from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("core", "0003_user_master_user"),
     ]
@@ -41,11 +42,8 @@ class Migration(migrations.Migration):
             ),
             preserve_default=True,
         ),
-        migrations.AddConstraint(
-            model_name="user",
-            constraint=models.UniqueConstraint(
-                fields=("email", "is_active"),
-                name="core_user_email_c0c03f_idx",
-            ),
+        migrations.AlterIndexTogether(
+            name="user",
+            index_together=set([("email", "is_active")]),
         ),
     ]

From 0ce959a4eb3aea3d38617c040b7efd64aed0bb35 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 25 Jul 2025 12:29:03 +0200
Subject: [PATCH 7/8] Cleanup

---
 frontend/src/api/accounts.js                              | 7 ++-----
 frontend/src/components/admin/domains/DomainAdminList.vue | 7 +++++--
 frontend/src/components/admin/identities/IdentityList.vue | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/api/accounts.js b/frontend/src/api/accounts.js
index f04404445..c04b97ce5 100644
--- a/frontend/src/api/accounts.js
+++ b/frontend/src/api/accounts.js
@@ -3,17 +3,14 @@ import repository from './repository'
 const resource = 'accounts'
 
 export default {
-  getAll({ domain, role }) {
+  getAll(params) {
     return repository.get(`/${resource}/`, {
-      params: { domain, role },
+      params,
       paramsSerializer: {
         indexes: null,
       },
     })
   },
-  getAllParams(params) {
-    return repository.get(`${resource}/`, { params })
-  },
   get(accountId) {
     return repository.get(`${resource}/${accountId}/`)
   },
diff --git a/frontend/src/components/admin/domains/DomainAdminList.vue b/frontend/src/components/admin/domains/DomainAdminList.vue
index 99077af75..1e3dde671 100644
--- a/frontend/src/components/admin/domains/DomainAdminList.vue
+++ b/frontend/src/components/admin/domains/DomainAdminList.vue
@@ -130,9 +130,12 @@ function fetchAdministrators(domain) {
 
 function fetchAccounts() {
   accountApi
-    .getAll({ role: [constants.RESELLER, constants.DOMAIN_ADMIN] })
+    .getAll({
+      role: [constants.RESELLER, constants.DOMAIN_ADMIN],
+      page_size: 50,
+    })
     .then((resp) => {
-      accounts.value = resp.data.filter(
+      accounts.value = resp.data.results.filter(
         (account) =>
           administrators.value.find((admin) => admin.id === account.pk) ===
           undefined
diff --git a/frontend/src/components/admin/identities/IdentityList.vue b/frontend/src/components/admin/identities/IdentityList.vue
index d0f358a3b..98073605c 100644
--- a/frontend/src/components/admin/identities/IdentityList.vue
+++ b/frontend/src/components/admin/identities/IdentityList.vue
@@ -329,7 +329,7 @@ async function fetchIdentities() {
   try {
     const resp =
       identityType.value === 'account'
-        ? await accountsApi.getAllParams(params)
+        ? await accountsApi.getAll(params)
         : await aliasesApi.getAll(params)
     identities.value = resp.data.results
     totalIdentities.value = resp.data.count

From 15b25377ba76d0d32773110bccdd9393402b4a15 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 25 Jul 2025 12:59:48 +0200
Subject: [PATCH 8/8] Some updates

---
 .../components/admin/identities/IdentityList.vue   | 13 +++++++++++--
 .../src/components/tools/ChooseColumnsForm.vue     |  5 +++++
 .../core/management/commands/load_initial_data.py  | 14 +++++++-------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/admin/identities/IdentityList.vue b/frontend/src/components/admin/identities/IdentityList.vue
index 98073605c..fcb23d18c 100644
--- a/frontend/src/components/admin/identities/IdentityList.vue
+++ b/frontend/src/components/admin/identities/IdentityList.vue
@@ -9,7 +9,7 @@
       :items-length="totalIdentities"
       :page="currentPage"
       :items-per-page="itemsPerPageR"
-      item-value="key"
+      item-value="pk"
       elevation="0"
       show-select
       :sort-by="sortByR"
@@ -35,7 +35,7 @@
             :title="$gettext('Customize displayed columns')"
             @click="showColumnsForm = true"
           ></v-btn>
-          <v-menu location="bottom">
+          <v-menu v-if="selected.length > 1" location="bottom">
             <template #activator="{ props }">
               <v-btn
                 append-icon="mdi-chevron-down"
@@ -157,6 +157,7 @@
       <ChooseColumnsForm
         :columns="columns"
         :available-columns="currentAvailableColumns"
+        :mandatory-columns="mandatoryColumns"
         @apply="updateDisplayedColumns"
       />
     </v-dialog>
@@ -294,8 +295,16 @@ const currentAvailableColumns = computed(() => {
   }
 })
 
+const mandatoryColumns = computed(() => {
+  if (identityType.value === 'account') {
+    return ['username']
+  }
+  return ['address']
+})
+
 async function updateType(value) {
   loading.value = true
+  identities.value = []
   sortByR.value = []
   if (value === 'account') {
     columns.value = defaultAccountsColumns
diff --git a/frontend/src/components/tools/ChooseColumnsForm.vue b/frontend/src/components/tools/ChooseColumnsForm.vue
index 5dfc206cf..215f4387c 100644
--- a/frontend/src/components/tools/ChooseColumnsForm.vue
+++ b/frontend/src/components/tools/ChooseColumnsForm.vue
@@ -9,6 +9,7 @@
           color="primary"
           hide-details
           density="compact"
+          :disabled="props.mandatoryColumns.includes(column.key)"
         />
       </div>
     </v-card-text>
@@ -27,6 +28,10 @@ const props = defineProps({
     type: Array,
     default: null,
   },
+  mandatoryColumns: {
+    type: Array,
+    default: null,
+  },
   columns: {
     type: Array,
     default: null,
diff --git a/modoboa/core/management/commands/load_initial_data.py b/modoboa/core/management/commands/load_initial_data.py
index 9c04cd974..e6f605ee9 100644
--- a/modoboa/core/management/commands/load_initial_data.py
+++ b/modoboa/core/management/commands/load_initial_data.py
@@ -119,14 +119,14 @@ class Command(BaseCommand):
         redirect_uris = " ".join([f"{uri}/login/logged" for uri in base_uris_list])
         redirect_uri = redirect_uris.split(" ")[0]
         client_id = ""
+        if options["dev"]:
+            base_uri = "https://localhost:3000/"
+            base_uris = base_uri
+            redirect_uri = "https://localhost:3000/login/logged"
+            redirect_uris = redirect_uri
+            client_id = "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD"
         if not frontend_application.exists():
-            if options["dev"]:
-                base_uri = "https://localhost:3000/"
-                base_uris = base_uri
-                redirect_uri = "https://localhost:3000/login/logged"
-                redirect_uris = redirect_uri
-                client_id = "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD"
-            else:
+            if not options["dev"]:
                 client_id = str(uuid.uuid4())
             call_command(
                 "createapplication",