diff --git a/src/freedombone-app-bdsmail b/src/freedombone-app-bdsmail
index dee4d80f..8431625c 100755
--- a/src/freedombone-app-bdsmail
+++ b/src/freedombone-app-bdsmail
@@ -383,7 +383,7 @@ function install_bdsmail {
 
     bdsmail_admin_password="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a bdsmail -p "$bdsmail_admin_password"
-    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini admin $BDSMAIL_DIR/Maildir/i2p/admin $bdsmail_admin_password
+    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini admin $BDSMAIL_DIR/Maildir/i2p/admin "$bdsmail_admin_password"
 
     # Create mutt configuration
     mkdir /etc/skel/.mutt