diff --git a/package.json b/package.json
index 06670325843f..05a3468c52e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
diff --git a/public/version.json b/public/version.json
index 7e488263a60c..6fafb4fbb418 100644
--- a/public/version.json
+++ b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "10.2.0"
+  "version": "10.2.1"
 }
\ No newline at end of file
diff --git a/src/components/CippComponents/CippAddTenantGroupDrawer.jsx b/src/components/CippComponents/CippAddTenantGroupDrawer.jsx
index 75804c15f89c..a82e0fd3f791 100644
--- a/src/components/CippComponents/CippAddTenantGroupDrawer.jsx
+++ b/src/components/CippComponents/CippAddTenantGroupDrawer.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import { Button, Box } from "@mui/material";
 import { useForm, useFormState } from "react-hook-form";
 import { GroupAdd } from "@mui/icons-material";
@@ -6,7 +6,6 @@ import { CippOffCanvas } from "./CippOffCanvas";
 import { CippApiResults } from "./CippApiResults";
 import { ApiPostCall } from "../../api/ApiCall";
 import CippAddEditTenantGroups from "./CippAddEditTenantGroups";
-import { getCippValidator } from "../../utils/get-cipp-validator";
 
 export const CippAddTenantGroupDrawer = ({
   buttonText = "Add Tenant Group",
diff --git a/src/components/CippFormPages/CippAddEditUser.jsx b/src/components/CippFormPages/CippAddEditUser.jsx
index edcc5e7cb73c..b479cacd197a 100644
--- a/src/components/CippFormPages/CippAddEditUser.jsx
+++ b/src/components/CippFormPages/CippAddEditUser.jsx
@@ -112,6 +112,21 @@ const CippAddEditUser = (props) => {
     return username.toLowerCase();
   };
 
+  const validateOtherMails = (value) => {
+    if (!value || (Array.isArray(value) && value.length === 0)) {
+      return true;
+    }
+
+    const emailList = (Array.isArray(value) ? value.join(",") : value)
+      .split(",")
+      .map((email) => email.trim())
+      .filter(Boolean);
+
+    const invalidEmail = emailList.find((email) => getCippValidator(email, "email") !== true);
+
+    return !invalidEmail || `This is not a valid email: ${invalidEmail}`;
+  };
+
   useEffect(() => {
     //if watch.firstname changes, and watch.lastname changes, set displayname to firstname + lastname
     if (watcher.givenName && watcher.surname && formType === "add") {
@@ -331,7 +346,6 @@ const CippAddEditUser = (props) => {
             setDisplayNameManuallySet(true);
           }}
           required={true}
-          validators={{ required: "Display Name is required" }}
         />
       </Grid>
       <Grid size={{ md: 6, xs: 12 }}>
@@ -356,7 +370,6 @@ const CippAddEditUser = (props) => {
             setUsernameManuallySet(true);
           }}
           required={true}
-          validators={{ required: "Username is required" }}
         />
       </Grid>
       <Grid size={{ md: 6, xs: 12 }}>
@@ -603,10 +616,10 @@ const CippAddEditUser = (props) => {
         <CippFormComponent
           type="textField"
           fullWidth
-          label="Alternate Email Address"
+          label="Alternate Email Addresses (comma separated)"
           name="otherMails"
           formControl={formControl}
-          validators={{ validate: (value) => !value || getCippValidator(value, "email") }}
+          validators={{ validate: validateOtherMails }}
         />
       </Grid>
       {userSettingsDefaults?.userAttributes
diff --git a/src/layouts/config.js b/src/layouts/config.js
index 78a9cd4ed9d5..41c2ce0ed418 100644
--- a/src/layouts/config.js
+++ b/src/layouts/config.js
@@ -741,6 +741,11 @@ export const nativeMenuItems = [
             path: "/email/reports/calendar-permissions",
             permissions: ["Exchange.Mailbox.*"],
           },
+          {
+            title: "Mailbox Forwarding",
+            path: "/email/reports/mailbox-forwarding",
+            permissions: ["Exchange.Mailbox.*"],
+          },
           {
             title: "Anti-Phishing Filters",
             path: "/email/reports/antiphishing-filters",
diff --git a/src/layouts/top-nav.js b/src/layouts/top-nav.js
index e53973075533..370fd0f7ddbd 100644
--- a/src/layouts/top-nav.js
+++ b/src/layouts/top-nav.js
@@ -64,6 +64,7 @@ export const TopNav = (props) => {
   const [flashLock, setFlashLock] = useState(false);
   const itemRefs = useRef({});
   const touchDragRef = useRef({ startIdx: null, overIdx: null });
+  const tenantSelectorRef = useRef(null);
 
   const handleBookmarkClick = (event) => {
     setAnchorEl(event.currentTarget);
@@ -148,7 +149,10 @@ export const TopNav = (props) => {
     if (index <= 0 || animatingPair) return;
     const el1 = itemRefs.current[index];
     const el2 = itemRefs.current[index - 1];
-    if (!el1 || !el2) { moveBookmarkUp(index); return; }
+    if (!el1 || !el2) {
+      moveBookmarkUp(index);
+      return;
+    }
     const distance = el1.getBoundingClientRect().top - el2.getBoundingClientRect().top;
     setAnimatingPair({ idx1: index, idx2: index - 1, offset1: -distance, offset2: distance });
     setTimeout(() => {
@@ -162,7 +166,10 @@ export const TopNav = (props) => {
     if (index >= bookmarks.length - 1 || animatingPair) return;
     const el1 = itemRefs.current[index];
     const el2 = itemRefs.current[index + 1];
-    if (!el1 || !el2) { moveBookmarkDown(index); return; }
+    if (!el1 || !el2) {
+      moveBookmarkDown(index);
+      return;
+    }
     const distance = el2.getBoundingClientRect().top - el1.getBoundingClientRect().top;
     setAnimatingPair({ idx1: index, idx2: index + 1, offset1: distance, offset2: -distance });
     setTimeout(() => {
@@ -188,9 +195,16 @@ export const TopNav = (props) => {
   const popoverOpen = Boolean(anchorEl);
   const popoverId = popoverOpen ? "bookmark-popover" : undefined;
 
+  const openSearch = useCallback(() => {
+    searchDialog.handleOpen();
+  }, [searchDialog.handleOpen]);
+
   useEffect(() => {
     const handleKeyDown = (event) => {
-      if ((event.metaKey || event.ctrlKey) && event.key === "k") {
+      if ((event.metaKey || event.ctrlKey) && event.altKey && event.key === "k") {
+        event.preventDefault();
+        tenantSelectorRef.current?.focus();
+      } else if ((event.metaKey || event.ctrlKey) && event.key === "k") {
         event.preventDefault();
         openSearch();
       }
@@ -199,11 +213,7 @@ export const TopNav = (props) => {
     return () => {
       window.removeEventListener("keydown", handleKeyDown);
     };
-  }, []);
-
-  const openSearch = () => {
-    searchDialog.handleOpen();
-  };
+  }, [openSearch]);
 
   return (
     <Box
@@ -249,7 +259,9 @@ export const TopNav = (props) => {
           >
             <Logo />
           </Box>
-          {!mdDown && <CippTenantSelector refreshButton={true} tenantButton={true} />}
+          {!mdDown && (
+            <CippTenantSelector ref={tenantSelectorRef} refreshButton={true} tenantButton={true} />
+          )}
           {mdDown && (
             <IconButton color="inherit" onClick={onNavOpen}>
               <SvgIcon color="action" fontSize="small">
@@ -331,7 +343,13 @@ export const TopNav = (props) => {
                           },
                         }),
                       }}
-                      title={sortOrder === "custom" ? "Custom order" : sortOrder === "asc" ? "A > Z" : "Z > A"}
+                      title={
+                        sortOrder === "custom"
+                          ? "Custom order"
+                          : sortOrder === "asc"
+                            ? "A > Z"
+                            : "Z > A"
+                      }
                     >
                       {sortOrder === "custom" && <SwapVertIcon fontSize="small" />}
                       {sortOrder === "asc" && <ArrowUpwardIcon fontSize="small" />}
@@ -341,7 +359,11 @@ export const TopNav = (props) => {
                       variant="body2"
                       sx={{ ml: 0.5, color: "text.secondary", fontSize: 12 }}
                     >
-                      {sortOrder === "custom" ? "Custom order" : sortOrder === "asc" ? "A > Z" : "Z > A"}
+                      {sortOrder === "custom"
+                        ? "Custom order"
+                        : sortOrder === "asc"
+                          ? "A > Z"
+                          : "Z > A"}
                     </Typography>
                   </ListItem>
                   <Divider />
@@ -355,21 +377,35 @@ export const TopNav = (props) => {
                     displayBookmarks.map((bookmark, idx) => (
                       <ListItem
                         key={bookmark.path}
-                        ref={(el) => { itemRefs.current[idx] = el; }}
+                        ref={(el) => {
+                          itemRefs.current[idx] = el;
+                        }}
                         data-bookmark-index={idx}
                         draggable={reorderMode === "drag" && sortOrder === "custom" && !locked}
-                        {...(reorderMode === "drag" ? {
-                          onDragStart: (e) => {
-                            if (locked) { e.preventDefault(); triggerLockFlash(); return; }
-                            if (sortOrder !== "custom") { e.preventDefault(); triggerSortFlash(); return; }
-                            handleDragStart(idx);
-                          },
-                          onDragEnd: handleDragEnd,
-                          ...(sortOrder === "custom" && !locked ? {
-                            onDragOver: (e) => handleDragOver(e, idx),
-                            onDrop: (e) => handleDrop(e, idx),
-                          } : {}),
-                        } : {})}
+                        {...(reorderMode === "drag"
+                          ? {
+                              onDragStart: (e) => {
+                                if (locked) {
+                                  e.preventDefault();
+                                  triggerLockFlash();
+                                  return;
+                                }
+                                if (sortOrder !== "custom") {
+                                  e.preventDefault();
+                                  triggerSortFlash();
+                                  return;
+                                }
+                                handleDragStart(idx);
+                              },
+                              onDragEnd: handleDragEnd,
+                              ...(sortOrder === "custom" && !locked
+                                ? {
+                                    onDragOver: (e) => handleDragOver(e, idx),
+                                    onDrop: (e) => handleDrop(e, idx),
+                                  }
+                                : {}),
+                            }
+                          : {})}
                         sx={{
                           color: "inherit",
                           display: "flex",
@@ -377,25 +413,34 @@ export const TopNav = (props) => {
                           "&:hover .bookmark-controls": {
                             opacity: 1,
                           },
-                          ...(sortOrder === "custom" && reorderMode === "drag" && dragIndex === idx && {
-                            opacity: 0.4,
-                          }),
-                          ...(sortOrder === "custom" && reorderMode === "drag" && dragOverIndex === idx && dragIndex !== idx && {
-                            borderTop: "2px solid",
-                            borderColor: "primary.main",
-                          }),
-                          ...(animatingPair && (animatingPair.idx1 === idx || animatingPair.idx2 === idx) && {
-                            transform: `translateY(${animatingPair.idx1 === idx ? animatingPair.offset1 : animatingPair.offset2}px)`,
-                            transition: 'transform 250ms ease-in-out',
-                            position: 'relative',
-                            zIndex: animatingPair.idx1 === idx ? 1 : 0,
-                          }),
+                          ...(sortOrder === "custom" &&
+                            reorderMode === "drag" &&
+                            dragIndex === idx && {
+                              opacity: 0.4,
+                            }),
+                          ...(sortOrder === "custom" &&
+                            reorderMode === "drag" &&
+                            dragOverIndex === idx &&
+                            dragIndex !== idx && {
+                              borderTop: "2px solid",
+                              borderColor: "primary.main",
+                            }),
+                          ...(animatingPair &&
+                            (animatingPair.idx1 === idx || animatingPair.idx2 === idx) && {
+                              transform: `translateY(${animatingPair.idx1 === idx ? animatingPair.offset1 : animatingPair.offset2}px)`,
+                              transition: "transform 250ms ease-in-out",
+                              position: "relative",
+                              zIndex: animatingPair.idx1 === idx ? 1 : 0,
+                            }),
                         }}
                       >
                         {reorderMode === "drag" && !locked && (
                           <Box
                             onTouchStart={() => {
-                              if (sortOrder !== "custom") { triggerSortFlash(); return; }
+                              if (sortOrder !== "custom") {
+                                triggerSortFlash();
+                                return;
+                              }
                               touchDragRef.current.startIdx = idx;
                               setDragIndex(idx);
                             }}
@@ -409,7 +454,11 @@ export const TopNav = (props) => {
                               const li = el?.closest("[data-bookmark-index]");
                               if (li) {
                                 const overIdx = parseInt(li.dataset.bookmarkIndex, 10);
-                                if (!isNaN(overIdx) && overIdx >= 0 && overIdx < (settings.bookmarks || []).length) {
+                                if (
+                                  !isNaN(overIdx) &&
+                                  overIdx >= 0 &&
+                                  overIdx < (settings.bookmarks || []).length
+                                ) {
                                   touchDragRef.current.overIdx = overIdx;
                                   setDragOverIndex(overIdx);
                                 }
@@ -470,7 +519,10 @@ export const TopNav = (props) => {
                                 size="small"
                                 onClick={(e) => {
                                   e.preventDefault();
-                                  if (locked) { triggerLockFlash(); return; }
+                                  if (locked) {
+                                    triggerLockFlash();
+                                    return;
+                                  }
                                   sortOrder === "custom" ? animatedMoveUp(idx) : triggerSortFlash();
                                 }}
                                 disabled={sortOrder === "custom" && idx === 0}
@@ -482,10 +534,17 @@ export const TopNav = (props) => {
                                 size="small"
                                 onClick={(e) => {
                                   e.preventDefault();
-                                  if (locked) { triggerLockFlash(); return; }
-                                  sortOrder === "custom" ? animatedMoveDown(idx) : triggerSortFlash();
+                                  if (locked) {
+                                    triggerLockFlash();
+                                    return;
+                                  }
+                                  sortOrder === "custom"
+                                    ? animatedMoveDown(idx)
+                                    : triggerSortFlash();
                                 }}
-                                disabled={sortOrder === "custom" && idx === displayBookmarks.length - 1}
+                                disabled={
+                                  sortOrder === "custom" && idx === displayBookmarks.length - 1
+                                }
                                 sx={{ opacity: sortOrder !== "custom" || locked ? 0.4 : 1 }}
                               >
                                 <KeyboardArrowDownIcon fontSize="small" />
@@ -497,7 +556,10 @@ export const TopNav = (props) => {
                               size="small"
                               onClick={(e) => {
                                 e.preventDefault();
-                                if (locked) { triggerLockFlash(); return; }
+                                if (locked) {
+                                  triggerLockFlash();
+                                  return;
+                                }
                                 removeBookmark(bookmark.path);
                               }}
                               sx={{ ...(locked && { opacity: 0.4 }) }}
diff --git a/src/pages/email/reports/mailbox-forwarding/index.js b/src/pages/email/reports/mailbox-forwarding/index.js
new file mode 100644
index 000000000000..008637df1a97
--- /dev/null
+++ b/src/pages/email/reports/mailbox-forwarding/index.js
@@ -0,0 +1,116 @@
+import { Layout as DashboardLayout } from "../../../../layouts/index.js";
+import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx";
+import { useState } from "react";
+import { Button, Alert, SvgIcon, IconButton, Tooltip } from "@mui/material";
+import { useSettings } from "../../../../hooks/use-settings";
+import { Stack } from "@mui/system";
+import { Sync, Info } from "@mui/icons-material";
+import { useDialog } from "../../../../hooks/use-dialog";
+import { CippApiDialog } from "../../../../components/CippComponents/CippApiDialog";
+import { CippQueueTracker } from "../../../../components/CippTable/CippQueueTracker";
+
+const Page = () => {
+  const currentTenant = useSettings().currentTenant;
+  const syncDialog = useDialog();
+  const [syncQueueId, setSyncQueueId] = useState(null);
+
+  const isAllTenants = currentTenant === "AllTenants";
+
+  const columns = [
+    ...(isAllTenants ? ["Tenant"] : []),
+    "UPN",
+    "DisplayName",
+    "RecipientTypeDetails",
+    "ForwardingType",
+    "ForwardTo",
+    "DeliverToMailboxAndForward",
+    "CacheTimestamp",
+  ];
+
+  const apiData = {
+    UseReportDB: true,
+  };
+
+  const filters = [
+    {
+      filterName: "External Forwarding",
+      value: [{ id: "ForwardingType", value: "External" }],
+      type: "column",
+    },
+    {
+      filterName: "Internal Forwarding",
+      value: [{ id: "ForwardingType", value: "Internal" }],
+      type: "column",
+    },
+  ];
+
+  const pageActions = [
+    <Stack direction="row" spacing={2} alignItems="center" key="actions-stack">
+      <CippQueueTracker
+        queueId={syncQueueId}
+        queryKey={`mailbox-forwarding-${currentTenant}`}
+        title="Mailbox Forwarding Sync"
+      />
+      <Tooltip title="This report displays cached mailbox data from the CIPP reporting database. Cache timestamps are shown in the table. Click the Sync button to update the mailbox cache for the current tenant.">
+        <IconButton size="small">
+          <Info fontSize="small" />
+        </IconButton>
+      </Tooltip>
+      <Button
+        startIcon={
+          <SvgIcon fontSize="small">
+            <Sync />
+          </SvgIcon>
+        }
+        size="xs"
+        onClick={syncDialog.handleOpen}
+        disabled={isAllTenants}
+      >
+        Sync
+      </Button>
+    </Stack>,
+  ];
+
+  return (
+    <>
+      {currentTenant && currentTenant !== "" ? (
+        <CippTablePage
+          title="Mailbox Forwarding Report"
+          apiUrl="/api/ListMailboxForwarding"
+          queryKey={`mailbox-forwarding-${currentTenant}`}
+          apiData={apiData}
+          simpleColumns={columns}
+          filters={filters}
+          cardButton={pageActions}
+          offCanvas={null}
+        />
+      ) : (
+        <Alert severity="warning">Please select a tenant to view mailbox forwarding settings.</Alert>
+      )}
+      <CippApiDialog
+        createDialog={syncDialog}
+        title="Sync Mailbox Cache"
+        fields={[]}
+        api={{
+          type: "GET",
+          url: "/api/ExecCIPPDBCache",
+          confirmText: `Run mailbox cache sync for ${currentTenant}? This will update mailbox data including forwarding settings.`,
+          relatedQueryKeys: [`mailbox-forwarding-${currentTenant}`],
+          data: {
+            Name: "Mailboxes",
+            Types: "",
+          },
+          onSuccess: (result) => {
+            if (result?.Metadata?.QueueId) {
+              setSyncQueueId(result.Metadata.QueueId);
+            }
+          },
+        }}
+      />
+    </>
+  );
+};
+
+Page.getLayout = (page) => <DashboardLayout>{page}</DashboardLayout>;
+
+export default Page;
diff --git a/src/pages/identity/administration/users/add.jsx b/src/pages/identity/administration/users/add.jsx
index 28606efc90ba..46a8c07fac61 100644
--- a/src/pages/identity/administration/users/add.jsx
+++ b/src/pages/identity/administration/users/add.jsx
@@ -2,13 +2,13 @@ import { Box } from "@mui/material";
 import CippFormPage from "../../../../components/CippFormPages/CippFormPage";
 import { Layout as DashboardLayout } from "../../../../layouts/index.js";
 import { useForm, useWatch } from "react-hook-form";
-import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector";
 import { useSettings } from "../../../../hooks/use-settings";
 import { useEffect } from "react";
 
 import CippAddEditUser from "../../../../components/CippFormPages/CippAddEditUser";
 const Page = () => {
   const userSettingsDefaults = useSettings();
+  const tenantDomain = useSettings().currentTenant;
 
   const formControl = useForm({
     mode: "onBlur",
@@ -54,6 +54,7 @@ const Page = () => {
         title="User"
         backButtonTitle="User Overview"
         postUrl="/api/AddUser"
+        relatedQueryKeys={`Users - ${tenantDomain}`}
       >
         <Box sx={{ my: 2 }}>
           <CippAddEditUser formControl={formControl} userSettingsDefaults={userSettingsDefaults} />