diff --git a/script/Xconfigure.sh b/script/Xconfigure.sh
index 261673e..19a383c 100755
--- a/script/Xconfigure.sh
+++ b/script/Xconfigure.sh
@@ -218,17 +218,30 @@ SS_CONFIG="/home/${USER}/.xscreensaver"
 DEFAULT_SS_TIMEOUT='0:15:00'    # 15 minutes
 
 # Set to default unless a BCLD parameter is given
-if [[ -n "${BCLD_SCREENSAVER}" ]]; then
+if [[ "${BCLD_SCREENSAVER}" == '0' ]]; then
+    # Disable xscreensaver if the value is 0
+    /usr/bin/echo "BCLD_SCREENSAVER found, but set to: ${BCLD_SCREENSAVER}"
+    /usr/bin/echo "xscreensaver disabled!"
+
+    # Do not start xscreensaver
+elif [[ -n "${BCLD_SCREENSAVER}" ]]; then
+    # If the value is anything else, use that instead
     BCLD_SS_TIMEOUT="0:${BCLD_SCREENSAVER}:00"
 
     /usr/bin/echo "BCLD_SCREENSAVER found!: ${BCLD_SS_TIMEOUT}"
     /usr/bin/echo -e "\ntimeout: ${BCLD_SS_TIMEOUT}" >> "${SS_CONFIG}"
+
+    # Start xscreensaver
+    /usr/bin/xscreensaver &
 else
+    # If there is no value, use the default
     /usr/bin/echo "BCLD_SCREENSAVER not found! Using default: ${DEFAULT_SS_TIMEOUT}"
     /usr/bin/echo -e "\ntimeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}"
+
+    # Start xscreensaver
+    /usr/bin/xscreensaver &
 fi
 
-/usr/bin/xscreensaver &
 
 
 log_last 'X settings configured!'
diff --git a/test/bcld.md5 b/test/bcld.md5
index 720bc82..2afd436 100644
--- a/test/bcld.md5
+++ b/test/bcld.md5
@@ -101,7 +101,7 @@ bc8d4c92bdbadd1c62c088184f39073f  ./config/trap_shutdown/virt/virt-warning-5.png
 c99677e6deb495fb2b90cbfb84ac7349  ./config/udev/rules.d/BCLD-USB.rules
 87ecdd57738b7ed7fe23e3da8a492593  ./image/ISO/README.diskdefines
 49a4210f52e5bcc79077d12c3dfd63f5  ./image/ISO/isolinux/isolinux.cfg
-9e2a5b057da738bc2f2cdeb136639d9f  ./script/Xconfigure.sh
+b901f8f3921cc3d098a252057538c5aa  ./script/Xconfigure.sh
 3f0e4d55a962e4dd009c1ae8c4db7739  ./script/autocert.sh
 f6604ec06c9aa1b19247785ed0f280a2  ./script/bcld_app.sh
 caeaba6f3ea103a2d0ee5a68b44baa93  ./script/bcld_vendor.sh
diff --git a/test/md5sum b/test/md5sum
index a55b844..4b8c362 100644
--- a/test/md5sum
+++ b/test/md5sum
@@ -1 +1 @@
-eafe14e0bf4476b39c4dace7bba90040  ./test/bcld.md5
+8c16026525c4068066caa35e9048175b  ./test/bcld.md5