diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
index 87600dd55f..d3991219df 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
@@ -31,6 +31,7 @@ interface RenderFieldProps {
   disabled?: boolean;
   readOnly?: boolean;
   autoHide?: boolean;
+  showRememberTip?: boolean;
   onFocus?: (event: React.FocusEvent<HTMLInputElement>) => void;
 }
 
@@ -42,6 +43,7 @@ const RenderField: React.FC<RenderFieldProps> = observer(function RenderField({
   disabled,
   readOnly,
   autoHide,
+  showRememberTip,
   onFocus,
 }) {
   const href = property.features.includes('href');
@@ -67,7 +69,7 @@ const RenderField: React.FC<RenderFieldProps> = observer(function RenderField({
     );
   }
 
-  if (password && property.value) {
+  if (showRememberTip && password && property.value) {
     description = 'Password saved';
   }
 
@@ -98,6 +100,7 @@ interface ObjectPropertyFormProps {
   disabled?: boolean;
   readOnly?: boolean;
   autoHide?: boolean;
+  showRememberTip?: boolean;
   onFocus?: (name: string) => void;
 }
 
@@ -110,6 +113,7 @@ export const ObjectPropertyInfoForm: React.FC<ObjectPropertyFormProps> = observe
   disabled,
   readOnly,
   autoHide,
+  showRememberTip,
   onFocus,
 }) {
   const style = useStyles(formStyles);
@@ -136,6 +140,7 @@ export const ObjectPropertyInfoForm: React.FC<ObjectPropertyFormProps> = observe
             disabled={disabled}
             readOnly={readOnly}
             autoHide={autoHide}
+            showRememberTip={showRememberTip}
             onFocus={handleFocus}
           />
         </FormGroup>
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
index 7f5bd0d911..afe0cdc83a 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
@@ -142,6 +142,7 @@ export const Options = observer(function Options({
                 properties={controller.properties}
                 credentials={model.credentials}
                 disabled={disabled}
+                showRememberTip
               />
               <FormGroup>
                 <FieldCheckbox