diff --git a/install.sh b/install.sh
index 3352ce0..3f763ce 100755
--- a/install.sh
+++ b/install.sh
@@ -549,7 +549,7 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 
 	ask_additionals;
 
-	if [ "$NEXTCLOUD" != "" ]; then
+	if [ "$NEXTCLOUD" == "yes" ]; then
 		VAR_NEXTCLOUD="--env NEXTCLOUD=$NEXTCLOUD";
 		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN";
 		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME";
@@ -570,7 +570,7 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 		fi
 	fi
 	
-	if [ "$BITWARDEN" != "" ]; then
+	if [ "$BITWARDEN" == "yes" ]; then
 		VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN";
 		VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN";
 		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_SERVER=$SMTP_SERVER";