diff --git a/src/freedombone-app-bdsmail b/src/freedombone-app-bdsmail
index cf4994d3..ec55a3ea 100755
--- a/src/freedombone-app-bdsmail
+++ b/src/freedombone-app-bdsmail
@@ -97,6 +97,7 @@ function add_user_bdsmail {
     fi
     sed -i "s|username|$new_username|g" /home/$new_username/.mutt/bdsmail
     bdsmail_configure_users
+    cd $BDSMAIL_DIR
     $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini $new_username /home/$new_username/Maildir/i2p
     chown -R $new_username:$new_username /home/$new_username/.mutt
     echo '0'
@@ -413,6 +414,7 @@ function install_bdsmail {
 
     bdsmail_admin_password="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a bdsmail -p "$bdsmail_admin_password"
+    cd $BDSMAIL_DIR
     $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini admin $BDSMAIL_DIR/Maildir/i2p/admin "$bdsmail_admin_password"
 
     # Create mutt configuration
@@ -439,6 +441,7 @@ function install_bdsmail {
 
     bdsmail_configure_users
 
+    cd $BDSMAIL_DIR
     $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini $MY_USERNAME /home/$MY_USERNAME/Maildir/i2p
 
     APP_INSTALLED=1