diff --git a/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/LdapFieldComponent.js b/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/LdapFieldComponent.js
index ccb0ff1dc1..a9c8c74201 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/LdapFieldComponent.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/LdapFieldComponent.js
@@ -39,7 +39,7 @@ const LdapFieldComponent = (props) => {
     name,
     onChange,
     isPassword,
-    ...prop
+    ...rest
   } = props;
 
   const onChangeFn = (e) => {
@@ -54,12 +54,12 @@ const LdapFieldComponent = (props) => {
     onChange && onChange(e);
   };
 
-  const onFocus = (e) => {
-    const name = e.target.name;
-    if (errors[name]) {
-      removeErrorField(name);
-    }
-  };
+  // const onFocus = (e) => {
+  //   const name = e.target.name;
+  //   if (errors[name]) {
+  //     removeErrorField(name);
+  //   }
+  // };
 
   const onBlur = (e) => {
     if (e.target.value.trim() === "") {
@@ -68,16 +68,16 @@ const LdapFieldComponent = (props) => {
   };
 
   if (isTextArea)
-    return <Textarea name={name} onChange={onChangeFn} {...prop} />;
+    return <Textarea name={name} onChange={onChangeFn} {...rest} />;
 
   if (isPassword)
     return (
       <PasswordInput
-        name={name}
+        inputName={name}
         onBlur={onBlur}
-        onFocus={onFocus}
+        //onFocus={onFocus}
         onChange={onChangeFn}
-        {...prop}
+        {...rest}
       />
     );
 
@@ -85,9 +85,9 @@ const LdapFieldComponent = (props) => {
     <TextInput
       name={name}
       onBlur={onBlur}
-      onFocus={onFocus}
+      //onFocus={onFocus}
       onChange={onChangeFn}
-      {...prop}
+      {...rest}
     />
   );
 };
diff --git a/packages/shared/components/input-block/InputBlock.tsx b/packages/shared/components/input-block/InputBlock.tsx
index 49dfc1b599..bb32fd65f3 100644
--- a/packages/shared/components/input-block/InputBlock.tsx
+++ b/packages/shared/components/input-block/InputBlock.tsx
@@ -160,23 +160,25 @@ const InputBlock = ({
         forwardedRef={forwardedRef}
       />
 
-      <div className="append">
-        <StyledIconBlock
-          className={`input-block-icon ${iconButtonClassName}`}
-          onClick={onIconClickAction}
-          isClickable={!!onIconClick}
-        >
-          <IconButton
-            size={iconButtonSize}
-            iconNode={iconNode}
-            iconName={iconName || ""}
-            isFill={isIconFill}
-            isClickable={typeof onIconClick === "function"}
-            color={iconColor}
-            hoverColor={hoverColor}
-          />
-        </StyledIconBlock>
-      </div>
+      {!isDisabled && (
+        <div className="append">
+          <StyledIconBlock
+            className={`input-block-icon ${iconButtonClassName}`}
+            onClick={onIconClickAction}
+            isClickable={!!onIconClick}
+          >
+            <IconButton
+              size={iconButtonSize}
+              iconNode={iconNode}
+              iconName={iconName || ""}
+              isFill={isIconFill}
+              isClickable={typeof onIconClick === "function"}
+              color={iconColor}
+              hoverColor={hoverColor}
+            />
+          </StyledIconBlock>
+        </div>
+      )}
     </StyledInputGroup>
   );
 };