diff --git a/scripts/Windows/2_deploy.sh b/scripts/Windows/2_deploy.sh
index 515a70098..54e6371d2 100644
--- a/scripts/Windows/2_deploy.sh
+++ b/scripts/Windows/2_deploy.sh
@@ -30,9 +30,9 @@ case $i in
         shift # past argument=value
         ;;
     -cp=*|--cert_pssw=*)
-        if [ -z "${i#*=}" ]; then
+        CERT_PSSW="${i#*=}"
+        if [ -n "$CERT_PSSW" ]; then
             SIGN=true
-            CERT_PSSW="${i#*=}"
         fi
         shift # past argument=value
         ;;
@@ -60,4 +60,4 @@ if [ "$SIGN" = true ] ; then
     bash $SCRIPTS_PATH/internal/2b_sign_dlls.sh -i=$PACKAGES_PATH  $CERT_FILE_OPTION -cp=$CERT_PSSW
 
     echo "======= Installer Signed ======="
-fi
\ No newline at end of file
+fi