diff --git a/scripts/remove b/scripts/remove
index 73d5bca..5f4e91e 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -18,10 +18,10 @@ ynh_print_info "Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get $app domain)
-db_name=$(ynh_app_setting_get $app psql_db)
+domain=$(ynh_app_setting_get "$app" domain)
+db_name=$(ynh_app_setting_get "$app" psql_db)
 db_user=$db_name
-final_path=$(ynh_app_setting_get $app final_path)
+final_path=$(ynh_app_setting_get "$app" final_path)
 
 #=================================================
 # STANDARD REMOVE
@@ -30,10 +30,10 @@ final_path=$(ynh_app_setting_get $app final_path)
 #=================================================
 
 # Remove a service from the admin panel, added by `yunohost service add`
-if yunohost service status $app >/dev/null 2>&1
+if yunohost service status "$app" >/dev/null 2>&1
 then
 	ynh_print_info "Removing $app service"
-	yunohost service remove $app
+	yunohost service remove "$app"
 fi
 
 #=================================================
@@ -50,7 +50,7 @@ ynh_remove_systemd_config
 ynh_print_info "Removing the PostgreSQL database"
 
 # Remove a database if it exists, along with the associated user
-ynh_psql_remove_db $db_name $db_name
+ynh_psql_remove_db "$db_name" "$db_name"
 
 #=================================================
 # REMOVE DEPENDENCIES
@@ -117,7 +117,7 @@ ynh_secure_remove "/var/log/$app/"
 ynh_print_info "Removing the dedicated system user"
 
 # Delete a system user
-ynh_system_user_delete $app
+ynh_system_user_delete "$app"
 
 #=================================================
 # END OF SCRIPT