diff --git a/src/components/CippWizard/CippWizardOffboarding.jsx b/src/components/CippWizard/CippWizardOffboarding.jsx
index f808452f8f65..5b411f14740f 100644
--- a/src/components/CippWizard/CippWizardOffboarding.jsx
+++ b/src/components/CippWizard/CippWizardOffboarding.jsx
@@ -5,6 +5,8 @@ import { CippFormCondition } from "../CippComponents/CippFormCondition";
 
 export const CippWizardOffboarding = (props) => {
   const { postUrl, formControl, onPreviousStep, onNextStep, currentStep } = props;
+  const currentTenant = formControl.watch("tenantFilter");
+
   return (
     <Stack spacing={3}>
       <>
@@ -102,6 +104,7 @@ export const CippWizardOffboarding = (props) => {
               formControl={formControl}
               multi
               api={{
+                tenantFilter: currentTenant ? currentTenant.value : undefined,
                 url: "/api/ListGraphRequest",
                 dataKey: "Results",
                 labelField: (option) => `${option.displayName} (${option.userPrincipalName})`,
@@ -129,6 +132,7 @@ export const CippWizardOffboarding = (props) => {
                 valueField: "id",
                 url: "/api/ListGraphRequest",
                 dataKey: "Results",
+                tenantFilter: currentTenant ? currentTenant.value : undefined,
                 data: {
                   Endpoint: "users",
                   manualPagination: true,
@@ -148,6 +152,7 @@ export const CippWizardOffboarding = (props) => {
               formControl={formControl}
               multi
               api={{
+                tenantFilter: currentTenant ? currentTenant.value : undefined,
                 labelField: (option) => `${option.displayName} (${option.userPrincipalName})`,
                 valueField: "id",
                 url: "/api/ListGraphRequest",
@@ -169,7 +174,9 @@ export const CippWizardOffboarding = (props) => {
               type="autoComplete"
               placeholder="leave blank to not forward"
               formControl={formControl}
+              multiple={false}
               api={{
+                tenantFilter: currentTenant ? currentTenant.value : undefined,
                 labelField: (option) => `${option.displayName} (${option.userPrincipalName})`,
                 valueField: "id",
                 url: "/api/ListGraphRequest",
diff --git a/src/utils/get-cipp-formatting.js b/src/utils/get-cipp-formatting.js
index 534038bd7846..223b9985fbd6 100644
--- a/src/utils/get-cipp-formatting.js
+++ b/src/utils/get-cipp-formatting.js
@@ -19,7 +19,6 @@ export const getCippFormatting = (data, cellName, type) => {
   if (data?.label) {
     return data.label;
   }
-  console.log(data);
   if (data?.enabled === true && data?.date) {
     return isText
       ? `Yes, Scheduled for ${new Date(data.date).toLocaleString()}`