diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/InputsBinding.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/InputsBinding.java
index 61e545251a..42ca5228ff 100644
--- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/InputsBinding.java
+++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/InputsBinding.java
@@ -94,7 +94,14 @@ private void bindInput(Input input, Map<String, ? extends Value> context,
             final Value promptValue = promptContext.get(inputName);
 
             if (nonNull(promptValue)) {
-                value = promptValue;
+                Value valueFromContext = context.get(inputName);
+                boolean sensitive = input.getValue() != null && input.getValue().isSensitive() ||
+                        valueFromContext != null && valueFromContext.isSensitive();
+                if (!input.isPrivateInput() && sensitive) {
+                    value = ValueFactory.create(promptValue, true);
+                } else {
+                    value = promptValue;
+                }
             } else {
                 value = resolveValue(input, context, targetContext, systemProperties);
             }