diff --git a/package.json b/package.json
index 5103fa09b1bc..9e73b8d43a81 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.3.2",
+  "version": "5.4.0",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {
diff --git a/public/version_latest.txt b/public/version_latest.txt
index 84197c89467d..8a30e8f94a39 100644
--- a/public/version_latest.txt
+++ b/public/version_latest.txt
@@ -1 +1 @@
-5.3.2
+5.4.0
diff --git a/src/views/identity/administration/OffboardingWizard.jsx b/src/views/identity/administration/OffboardingWizard.jsx
index 86ec8293eff6..688be60b885f 100644
--- a/src/views/identity/administration/OffboardingWizard.jsx
+++ b/src/views/identity/administration/OffboardingWizard.jsx
@@ -74,7 +74,7 @@ const OffboardingWizard = () => {
       RemoveLicenses: values.RemoveLicenses,
       ResetPass: values.ResetPass,
       RevokeSessions: values.RevokeSessions,
-      user: values.User.value,
+      user: values.User,
       deleteuser: values.DeleteUser,
       removeRules: values.RemoveRules,
       removeMobile: values.RemoveMobile,
@@ -119,6 +119,7 @@ const OffboardingWizard = () => {
         <hr className="my-4" />
         <div className="mb-2">
           <RFFSelectSearch
+            multi
             label={'Users in ' + tenantDomain}
             values={users?.map((user) => ({
               value: user.userPrincipalName,
@@ -128,6 +129,17 @@ const OffboardingWizard = () => {
             name="User"
           />
           {usersError && <span>Failed to load list of users</span>}
+          <FormSpy>
+            {/* eslint-disable react/prop-types */}
+            {(props) => (
+              <>
+                {console.log(props.values)}
+                {props.values.User?.length >= 3 && (
+                  <CCallout color="warning">A maximum of three users is recommend.</CCallout>
+                )}
+              </>
+            )}
+          </FormSpy>
         </div>
         <hr className="my-4" />
       </CippWizard.Page>
@@ -278,10 +290,16 @@ const OffboardingWizard = () => {
                           <h5 className="mb-0">Selected Tenant:</h5>
                           {tenantDomain}
                         </CListGroupItem>
-                        <CListGroupItem className="d-flex justify-content-between align-items-center">
-                          <h5 className="mb-0">Selected User:</h5>
-                          {props.values.User.value}
-                        </CListGroupItem>
+
+                        {props.values.User.map((user) => (
+                          <CListGroupItem
+                            key={user.value}
+                            className="d-flex justify-content-between align-items-center"
+                          >
+                            <h5 className="mb-0">Selected User:</h5>
+                            {user.value}
+                          </CListGroupItem>
+                        ))}
                       </CListGroup>
                       <hr />
                     </CCol>
diff --git a/version_latest.txt b/version_latest.txt
index 84197c89467d..8a30e8f94a39 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-5.3.2
+5.4.0