diff --git a/src/components/CippComponents/CippAutocomplete.jsx b/src/components/CippComponents/CippAutocomplete.jsx
index c2fd56295bc8..3106eec4cd76 100644
--- a/src/components/CippComponents/CippAutocomplete.jsx
+++ b/src/components/CippComponents/CippAutocomplete.jsx
@@ -70,6 +70,7 @@ export const CippAutoComplete = (props) => {
     sx,
     removeOptions = [],
     sortOptions = false,
+    preselectedValue,
     ...other
   } = props;
 
@@ -166,13 +167,35 @@ export const CippAutoComplete = (props) => {
           };
         });
         setUsedOptions(convertedOptions);
+        if (preselectedValue && !defaultValue && !value && convertedOptions.length > 0) {
+          const preselectedOption = convertedOptions.find(
+            (option) => option.value === preselectedValue
+          );
+
+          if (preselectedOption) {
+            const newValue = multiple ? [preselectedOption] : preselectedOption;
+            if (onChange) {
+              onChange(newValue, newValue?.addedFields);
+            }
+          }
+        }
       }
     }
 
     if (actionGetRequest.isError) {
       setUsedOptions([{ label: getCippError(actionGetRequest.error), value: "error" }]);
     }
-  }, [api, actionGetRequest.data, actionGetRequest.isSuccess, actionGetRequest.isError]);
+  }, [
+    api,
+    actionGetRequest.data,
+    actionGetRequest.isSuccess,
+    actionGetRequest.isError,
+    preselectedValue,
+    defaultValue,
+    value,
+    multiple,
+    onChange,
+  ]);
 
   const memoizedOptions = useMemo(() => {
     let finalOptions = api ? usedOptions : options;
diff --git a/src/components/CippComponents/CippFormTenantSelector.jsx b/src/components/CippComponents/CippFormTenantSelector.jsx
index fdc3ab1264d5..5f295dece517 100644
--- a/src/components/CippComponents/CippFormTenantSelector.jsx
+++ b/src/components/CippComponents/CippFormTenantSelector.jsx
@@ -1,9 +1,10 @@
 import React from "react";
 import { CippFormComponent } from "./CippFormComponent";
+import { useSettings } from "../../hooks/use-settings";
 
 export const CippFormTenantSelector = ({
   formControl,
-  componentType='autoComplete',
+  componentType = "autoComplete",
   allTenants = false,
   type = "multiple",
   name = "tenantFilter",
@@ -21,13 +22,15 @@ export const CippFormTenantSelector = ({
     }
     return {};
   };
-
+  const currentTenant = useSettings()?.currentTenant;
   return (
     <CippFormComponent
       type={componentType}
       name={name}
       formControl={formControl}
+      preselectedValue={currentTenant ? currentTenant : null}
       placeholder="Select a tenant"
+      //default value is: if currentTenant is not null, then FIND
       api={{
         excludeTenantFilter: true,
         url: allTenants ? "/api/ListTenants?AllTenantSelector=true" : "/api/ListTenants",