diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
index bf65560..00c24da 100644
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@@ -1 +1,5 @@
+:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
+
+:heavy_exclamation_mark: Be sure to immediately change the default password!
+
 Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`.
diff --git a/scripts/upgrade b/scripts/upgrade
index 614d56f..a1b86b0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -57,9 +57,13 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data/_data_"
+	ynh_setup_source --dest_dir="$final_path"
+	# Remove the app directory securely
+	ynh_secure_remove --file="$final_path/snappymail/v/2.15.3"
 fi
 
+
+
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"