diff --git a/webmin/edit_upgrade.cgi b/webmin/edit_upgrade.cgi
index 8ccc7fb80..15b2955a7 100755
--- a/webmin/edit_upgrade.cgi
+++ b/webmin/edit_upgrade.cgi
@@ -60,8 +60,8 @@ if (!$skip_upgrade) {
 	print "<p>\n";
 	if (!$mode && !$dir) {
 		# Checkbox to delete original directory
-		print "<input type=checkbox name=delete value=1> ",
-			"$text{'upgrade_delete'}<br>\n";
+		print &ui_checkbox("delete", 1, $text{'upgrade_delete'},
+				   $gconfig{'upgrade_delete'}),"<br>\n";
 		}
 	if ((!$mode || $mode eq "rpm") && &foreign_check("proc")) {
 		# Checkbox to check signature
diff --git a/webmin/upgrade.cgi b/webmin/upgrade.cgi
index 71d433448..760d7dcbf 100755
--- a/webmin/upgrade.cgi
+++ b/webmin/upgrade.cgi
@@ -532,6 +532,10 @@ else {
 			# Can delete the temporary source directory
 			system("rm -rf \"$extract\"");
 			}
+		&lock_file("$config_directory/config");
+		$gconfig{'upgrade_delete'} = $in{'delete'};
+		&write_file("$config_directory/config", \%gconfig);
+		&unlock_file("$config_directory/config");
 		}
 	}
 &webmin_log("upgrade", undef, undef, { 'version' => $version,