diff --git a/scripts/remove b/scripts/remove
index 2964caf..a426ff5 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -50,7 +50,7 @@ ynh_remove_systemd_config
 ynh_print_info --message="Removing the MySQL database..."
 
 # Remove a database if it exists, along with the associated user
-ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
+ynh_psql_remove_db --db_user="$db_user" --db_name="$db_name"
 
 #=================================================
 # REMOVE DEPENDENCIES
diff --git a/scripts/restore b/scripts/restore
index 89749f0..0064d63 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -34,6 +34,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
+db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -93,7 +94,6 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_print_info --message="Restoring the PostgreSQL database..."
 
 ynh_psql_test_if_first_run
-db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"