diff --git a/additional_install.sh b/additional_install.sh
index a4ad16a..c781a39 100755
--- a/additional_install.sh
+++ b/additional_install.sh
@@ -50,13 +50,17 @@ if [[ "$BITWARDEN" == "yes" ]]; then
         DB_USER="$(echo $RANDOM | md5sum | head -c 8)";
         DB_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)";
         DB_ROOT_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)";
-	
+
+	BITWARDEN_DOMAIN="https://$BITWARDEN_DOMAIN";
+
+	echo "Your admin token is: $ADMIN_TOKEN";
+
 	sed -i "s/DB_MYSQL/$DB_MYSQL/g" /tmp/bitwarden/bitwarden-secret.json;
 	sed -i "s/DB_USER/$DB_USER/g" /tmp/bitwarden/bitwarden-secret.json;
 	sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
 	sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
 	sed -i "s/DOMAIN_NAME/$BITWARDEN_DOMAIN/g" /tmp/bitwarden/bitwarden-secret.json
-	sed -i "s/ADMINTOKEN/$BITWARDEN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/ADMINTOKEN/$ADMIN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
 
 	if [ "$SMTP_SERVER" == "1" ]; then
 		SMTP_HOST="smtp.gmail.com";
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";