diff --git a/config.sh b/config.sh
index a1244a4..f001a85 100755
--- a/config.sh
+++ b/config.sh
@@ -24,12 +24,13 @@ jq -n \
     --arg fs_test_image "${IMAGES_PATH}/fs_test_image.qcow2" \
     --arg iso_path "${ISO_PATH}" \
     --arg workspace_path "${WORKSPACE_PATH}" \
+    --arg windows_password "${WINDOWS_PASSWORD}" \
     '{
-        "config.json": {
+        "config.json": ({
           "iso_path": $iso_path,
           "extra_software": $extra_software,
-          "workspace_path": $workspace_path,
-        },
+          "workspace_path": $workspace_path
+        } + if $windows_password != "" then {"windows_password": $windows_password} else {} end),
         "lib/engines/hckinstall/hckinstall.json": {
           "hck_setup_scripts_path": $hlk_setup_scripts,
         },
diff --git a/helpers.sh b/helpers.sh
index 6afaaa3..23cb75d 100644
--- a/helpers.sh
+++ b/helpers.sh
@@ -27,23 +27,26 @@ command_exists() {
 }
 
 from_env_or_read() {
-    env_name="${1}"
-    read_msg="${2}"
+    local env_name="${1}"
+    local read_msg="${2}"
+    local value
+    local default_value="${!env_name}"
 
-    if [ -z "${!env_name}" ]; then
-        read -r -p "${read_msg}: " value
-        echo "${value}"
-    else
-        if [ "${INSTALL_SILENT}" == "true" ]; then
-            echo "${!env_name}"
+    if [ "${INSTALL_SILENT}" == "true" ]; then
+        echo "${default_value}"
+        return
+    fi
+
+    if [ -n "${default_value}" ]; then
+        read -r -p "${read_msg} [${default_value}]: " value
+        if [ -z "${value}" ]; then
+            echo "${default_value}"
         else
-            read -r -p "${read_msg} [${!env_name}]: " value
-            if [ -z "${value}" ]; then
-                echo "${!env_name}"
-            else
-                echo "${value}"
-            fi
+            echo "${value}"
         fi
+    else
+        read -r -p "${read_msg}: " value
+        echo "${value}"
     fi
 }
 
diff --git a/install.sh b/install.sh
index a3c863d..a28370f 100755
--- a/install.sh
+++ b/install.sh
@@ -43,12 +43,14 @@ repos_dir="$(from_env_or_read "REPOS_DIR" "Please provide path to repos director
 iso_path="$(from_env_or_read "ISO_PATH" "Please provide path to ISO directory")"
 images_path="$(from_env_or_read "IMAGES_PATH" "Please provide path to images directory")"
 workspace_path="$(from_env_or_read "WORKSPACE_PATH" "Please provide path to workspace directory")"
+windows_password="$(from_env_or_read "WINDOWS_PASSWORD" "Please provide HLK windows password (or press Enter to use default)")"
 
 echo "REPOS_DIR='${repos_dir}'" > "${bootstrap}"
 echo >>"${bootstrap}"
 echo "ISO_PATH='${iso_path}'" >>"${bootstrap}"
 echo "IMAGES_PATH='${images_path}'" >>"${bootstrap}"
 echo "WORKSPACE_PATH='${workspace_path}'" >>"${bootstrap}"
+echo "WINDOWS_PASSWORD='${windows_password}'" >>"${bootstrap}"
 echo >>"${bootstrap}"
 echo >>"${bootstrap}"