diff --git a/packages/vue/src/locales/en/account.json b/packages/vue/src/locales/en/account.json
index 7dcc847c..8d1a23d9 100644
--- a/packages/vue/src/locales/en/account.json
+++ b/packages/vue/src/locales/en/account.json
@@ -23,6 +23,12 @@
         "role": "Please select a role"
       }
     },
+    "messages": {
+      "created": "Invitation sent to {email}.",
+      "deleted": "Invitation deleted for {email}.",
+      "resend": "Invitation resent to {email}.",
+      "revoked": "Invitation revoked for {email}."
+    },
     "modal": {
       "title": "Invite an user"
     },
diff --git a/packages/vue/src/locales/fr/account.json b/packages/vue/src/locales/fr/account.json
index 686e1690..55f6c343 100644
--- a/packages/vue/src/locales/fr/account.json
+++ b/packages/vue/src/locales/fr/account.json
@@ -23,6 +23,12 @@
         "role": "Veuillez sélectionner un rôle"
       }
     },
+    "messages": {
+      "created": "Invitation envoyée à {email}.",
+      "deleted": "Invitation supprimée pour {email}.",
+      "resend": "Invitation renvoyée à {email}.",
+      "revoked": "Invitation révoquée pour {email}."
+    },
     "modal": {
       "title": "Inviter un utilisateur"
     },
diff --git a/packages/vue/src/views/Invitations/Index.vue b/packages/vue/src/views/Invitations/Index.vue
index 881e83a0..2d1c9df0 100644
--- a/packages/vue/src/views/Invitations/Index.vue
+++ b/packages/vue/src/views/Invitations/Index.vue
@@ -22,17 +22,16 @@
     v-if="showInvitationModal"
     :show="showInvitationModal"
     @close="showInvitationModal = false"
-    @created="handleInvitationCreated"
+    @invitation:created="handleInvitationCreated"
   />
 </template>
 
 <script setup lang="ts">
-// Imports
 import { useConfig } from "@dzangolab/vue3-config";
 import { useI18n } from "@dzangolab/vue3-i18n";
 import { Table } from "@dzangolab/vue3-tanstack-table";
 import { BadgeComponent, ButtonElement } from "@dzangolab/vue3-ui";
-import { ref, onMounted, h } from "vue";
+import { ref, onMounted, h, inject } from "vue";
 import { useRoute } from "vue-router";
 
 import InvitationModal from "./_components/InvitationModal.vue";
@@ -40,6 +39,7 @@ import { useTranslations } from "../../index";
 import useInvitationStore from "../../stores/accountInvitations";
 
 import type { AccountInvitation } from "../../types/accountInvitation";
+import type { SaasEventHandlers, EventMessage } from "../../types/plugin";
 import type { AppConfig } from "@dzangolab/vue3-config";
 import type { TableColumnDefinition } from "@dzangolab/vue3-tanstack-table";
 
@@ -47,12 +47,6 @@ defineProps({
   isLoading: Boolean,
 });
 
-const emit = defineEmits([
-  "invitation:deleted",
-  "invitation:resent",
-  "invitation:revoked",
-]);
-
 const config = useConfig() as AppConfig;
 const messages = useTranslations();
 const { t } = useI18n({ messages });
@@ -61,7 +55,14 @@ const { deleteInvitation, getInvitations, resendInvitation, revokeInvitation } =
   invitationStore;
 const route = useRoute();
 
+const eventHandlers = inject<SaasEventHandlers>(
+  Symbol.for("saas.eventHandlers"),
+  { notification: undefined }
+);
+
 const accountId = route.params.id as string;
+const invitations = ref<AccountInvitation[]>([]);
+const showInvitationModal = ref(false);
 
 const actionMenuData = [
   {
@@ -100,16 +101,15 @@ const columns: TableColumnDefinition<AccountInvitation>[] = [
   },
   {
     accessorKey: "role",
-    header: t("account.invitations.table.columns.role"),
     cell: ({ row: { original } }) =>
       h(BadgeComponent, {
         label: original.role,
         severity: original.role === "admin" ? "primary" : "success",
       }),
+    header: t("account.invitations.table.columns.role"),
   },
   {
     accessorKey: "status",
-    header: t("account.invitations.table.columns.status"),
     cell: ({ row: { original } }) =>
       h(BadgeComponent, {
         label: original.acceptedAt
@@ -123,24 +123,22 @@ const columns: TableColumnDefinition<AccountInvitation>[] = [
             ? "danger"
             : "warning",
       }),
+    header: t("account.invitations.table.columns.status"),
   },
   {
     accessorKey: "expiresAt",
-    header: t("account.invitations.table.columns.expiresAt"),
     cell: ({ row: { original } }) =>
       new Date(original.expiresAt).toLocaleDateString(),
+    header: t("account.invitations.table.columns.expiresAt"),
   },
   {
     accessorKey: "createdAt",
-    header: t("account.invitations.table.columns.createdAt"),
     cell: ({ row: { original } }) =>
       new Date(original.createdAt).toLocaleDateString(),
+    header: t("account.invitations.table.columns.createdAt"),
   },
 ];
 
-const invitations = ref<AccountInvitation[]>([]);
-const showInvitationModal = ref(false);
-
 onMounted(async () => {
   await fetchInvitations();
 });
@@ -158,22 +156,47 @@ async function handleDelete(invitation: AccountInvitation) {
   try {
     await deleteInvitation(accountId, invitation.id, config.apiBaseUrl);
     await fetchInvitations();
-    emit("invitation:deleted", invitation);
+
+    const message: EventMessage = {
+      message: t("account.invitations.messages.deleted", {
+        email: invitation.email,
+      }),
+      type: "success",
+    };
+
+    eventHandlers?.notification?.(message);
   } catch (error) {
     console.error("Failed to delete invitation:", error);
   }
 }
 
-const handleInvitationCreated = async () => {
+async function handleInvitationCreated(invitation: AccountInvitation) {
   showInvitationModal.value = false;
   await fetchInvitations();
-};
+
+  const message: EventMessage = {
+    message: t("account.invitations.messages.created", {
+      email: invitation.email,
+    }),
+    type: "success",
+  };
+
+  eventHandlers?.notification?.(message);
+}
 
 async function handleResend(invitation: AccountInvitation) {
   try {
     await resendInvitation(accountId, invitation.id, config.apiBaseUrl);
     await fetchInvitations();
-    emit("invitation:resent", invitation);
+
+    const message: EventMessage = {
+      message: t("account.invitations.messages.resend", {
+        email: invitation.email,
+      }),
+      type: "success",
+    };
+
+    eventHandlers?.notification?.(message);
   } catch (error) {
     console.error("Failed to resend invitation:", error);
   }
@@ -183,7 +206,15 @@ async function handleRevoke(invitation: AccountInvitation) {
   try {
     await revokeInvitation(accountId, invitation.id, config.apiBaseUrl);
     await fetchInvitations();
-    emit("invitation:revoked", invitation);
+
+    const message: EventMessage = {
+      message: t("account.invitations.messages.revoked", {
+        email: invitation.email,
+      }),
+      type: "success",
+    };
+
+    eventHandlers?.notification?.(message);
   } catch (error) {
     console.error("Failed to revoke invitation:", error);
   }
@@ -191,15 +222,15 @@ async function handleRevoke(invitation: AccountInvitation) {
 
 function onActionSelect(rowData: { action: string; data: AccountInvitation }) {
   switch (rowData.action) {
+    case "deleteInvitation":
+      handleDelete(rowData.data);
+      break;
     case "resendInvitation":
       handleResend(rowData.data);
       break;
     case "revokeInvitation":
       handleRevoke(rowData.data);
       break;
-    case "deleteInvitation":
-      handleDelete(rowData.data);
-      break;
   }
 }
 </script>
diff --git a/packages/vue/src/views/Invitations/_components/Form.vue b/packages/vue/src/views/Invitations/_components/Form.vue
index f178fa6d..0a93a279 100644
--- a/packages/vue/src/views/Invitations/_components/Form.vue
+++ b/packages/vue/src/views/Invitations/_components/Form.vue
@@ -52,13 +52,12 @@ import {
 
 import type { AccountInvitationCreateInput } from "../../../types/accountInvitation";
 import type { SaasConfig } from "../../../types/config";
-import type { SaasEventHandlers, EventMessage } from "../../../types/plugin";
 
 defineProps({
   loading: Boolean,
 });
 
-defineEmits(["cancel"]);
+const emit = defineEmits(["cancel", "invitation:created"]);
 
 const config = useConfig();
 const invitationStore = useInvitationStore();
@@ -82,25 +81,10 @@ const roles = computed(() => {
   return saasConfig?.saasAccountRoles || SAAS_ACCOUNT_ROLES_DEFAULT;
 });
 
-const eventHandlers = inject<SaasEventHandlers>(
-  Symbol.for("saas.eventHandlers"),
-  { notification: undefined }
-);
-
 async function onSubmit() {
   try {
     await addInvitation(accountId, formData.value, config.apiBaseUrl).then(
-      (response) => {
-        const message: EventMessage = {
-          type: "success",
-          message: t("account.invitations.messages.created"),
-          details: {
-            invitation: response,
-          },
-        };
-
-        eventHandlers?.notification?.(message);
-      }
+      (response) => emit("invitation:created", response)
     );
   } catch (error) {
     console.error("Form submission error:", error);
diff --git a/packages/vue/src/views/Invitations/_components/InvitationModal.vue b/packages/vue/src/views/Invitations/_components/InvitationModal.vue
index bc2e8827..1aabb6d3 100644
--- a/packages/vue/src/views/Invitations/_components/InvitationModal.vue
+++ b/packages/vue/src/views/Invitations/_components/InvitationModal.vue
@@ -4,7 +4,11 @@
     :title="t('account.invitations.modal.title')"
     @on:close="$emit('close')"
   >
-    <InvitationForm :loading="loading" @cancel="$emit('close')" />
+    <InvitationForm
+      :loading="loading"
+      @cancel="$emit('close')"
+      @invitation:created="onInvitationCreated"
+    />
   </Modal>
 </template>
 
@@ -15,15 +19,21 @@ import { Modal } from "@dzangolab/vue3-ui";
 import InvitationForm from "./Form.vue";
 import { useTranslations } from "../../../index";
 
+import type { AccountInvitation } from "../../../types/accountInvitation";
+
 defineProps({
   show: Boolean,
   loading: Boolean,
 });
 
-defineEmits(["close"]);
+const emit = defineEmits(["close", "invitation:created"]);
 
 const messages = useTranslations();
 const { t } = useI18n({ messages, locale: "en" });
+
+function onInvitationCreated(invitation: AccountInvitation) {
+  emit("invitation:created", invitation);
+}
 </script>
 
 <style lang="css">