diff --git a/src/frontend/src/components/inputComponent/index.tsx b/src/frontend/src/components/inputComponent/index.tsx
index e18c2b559..e355293ff 100644
--- a/src/frontend/src/components/inputComponent/index.tsx
+++ b/src/frontend/src/components/inputComponent/index.tsx
@@ -173,7 +173,10 @@ export default function InputComponent({
             >
               <Command
                 filter={(value, search) => {
-                  if (value.toLowerCase().includes(search.toLowerCase()) || value.includes("doNotFilter-"))
+                  if (
+                    value.toLowerCase().includes(search.toLowerCase()) ||
+                    value.includes("doNotFilter-")
+                  )
                     return 1; // ensures items arent filtered
                   return 0;
                 }}
diff --git a/src/frontend/src/components/inputGlobalComponent/index.tsx b/src/frontend/src/components/inputGlobalComponent/index.tsx
index 235b00988..0f0097fcf 100644
--- a/src/frontend/src/components/inputGlobalComponent/index.tsx
+++ b/src/frontend/src/components/inputGlobalComponent/index.tsx
@@ -37,8 +37,10 @@ export default function InputGlobalComponent({
         !globalVariablesEntries.includes(data.node?.template[name].value) &&
         data.node?.template[name].load_from_db
       ) {
-        onChange("");
-        setDb(false);
+        setTimeout(() => {
+          onChange("");
+          setDb(false);
+        }, 100);
       }
   }, [globalVariablesEntries]);
 
@@ -48,8 +50,10 @@ export default function InputGlobalComponent({
       data.node?.template[name].display_name
     ) {
       if (unavaliableFields[data.node?.template[name].display_name!]) {
-        setDb(true);
-        onChange(unavaliableFields[data.node?.template[name].display_name!]);
+        setTimeout(() => {
+          setDb(true);
+          onChange(unavaliableFields[data.node?.template[name].display_name!]);
+        }, 100);
       }
     }
   }, [unavaliableFields]);
@@ -81,6 +85,9 @@ export default function InputGlobalComponent({
       });
     }
   }
+
+  console.log(data.node?.template[name], data.node?.template[name].password);
+
   return (
     <InputComponent
       id={"input-" + name}
@@ -131,7 +138,7 @@ export default function InputGlobalComponent({
       )}
       selectedOption={
         data?.node?.template[name].load_from_db &&
-         globalVariablesEntries.includes(data?.node?.template[name].value??"")
+        globalVariablesEntries.includes(data?.node?.template[name].value ?? "")
           ? data?.node?.template[name].value
           : ""
       }