diff --git a/mysql/backup_db.cgi b/mysql/backup_db.cgi
index 2570f44dc..7f15fb7af 100755
--- a/mysql/backup_db.cgi
+++ b/mysql/backup_db.cgi
@@ -84,9 +84,18 @@ if ($cron) {
 
 	&foreign_require("cron");
 	@jobs = &cron::list_cron_jobs();
-	$cmd = $in{'all'} ? "$cron_cmd --all" : "$cron_cmd $in{'db'}";
-	($job) = grep { $_->{'command'} eq $cmd } @jobs;
+	if ($in{'all'}) {
+		($job) = grep { $_->{'command'} eq "$cron_cmd --all" } @jobs;
+		}
+	else {
+		($job) = grep {
+			$_->{'command'} eq $cron_cmd." ".$in{'db'} ||
+			$_->{'command'} eq $cron_cmd." ".quotemeta($in{'db'}) }
+			@jobs;
+		}
 	$oldjob = $job;
+	$cmd = $in{'all'} ? "$cron_cmd --all"
+			  : $cron_cmd." ".quotemeta($in{'db'});
 	$job ||= { 'command' => $cmd,
 		   'user' => 'root',
 		   'active' => 1 };
@@ -292,7 +301,7 @@ if (!$in{'dest'}) {
 		}
 	else {
 		&ui_print_footer(
-			"edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
+			"/$module_name/edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
 			&get_databases_return_link($in{'db'}), $text{'index_return'});
 		}
 	}
diff --git a/mysql/backup_form.cgi b/mysql/backup_form.cgi
index 8dd4e4e49..554b3d323 100755
--- a/mysql/backup_form.cgi
+++ b/mysql/backup_form.cgi
@@ -201,8 +201,15 @@ if ($cron) {
 	# Show cron time
 	&foreign_require("cron", "cron-lib.pl");
 	@jobs = &cron::list_cron_jobs();
-	$cmd = $in{'all'} ? "$cron_cmd --all" : "$cron_cmd $in{'db'}";
-	($job) = grep { $_->{'command'} eq $cmd } @jobs;
+	if ($in{'all'}) {
+		($job) = grep { $_->{'command'} eq "$cron_cmd --all" } @jobs;
+		}
+	else {
+		($job) = grep {
+			$_->{'command'} eq $cron_cmd." ".$in{'db'} ||
+			$_->{'command'} eq $cron_cmd." ".quotemeta($in{'db'}) }
+			@jobs;
+		}
 
 	print &ui_table_row($text{'backup_sched'},
 		&ui_radio("sched", $job ? 1 : 0,
diff --git a/mysql/mysql-lib.pl b/mysql/mysql-lib.pl
index fcca08ebd..744e80540 100755
--- a/mysql/mysql-lib.pl
+++ b/mysql/mysql-lib.pl
@@ -1983,8 +1983,8 @@ sub delete_database_backup_job
 my ($db) = @_;
 &foreign_require("cron");
 my @jobs = &cron::list_cron_jobs();
-my $cmd = "$cron_cmd $db";
-my ($job) = grep { $_->{'command'} eq $cmd } @jobs;
+my ($job) = grep { $_->{'command'} eq $cron_cmd." ".$db ||
+		   $_->{'command'} eq $cron_cmd." ".quotemeta($db) } @jobs;
 if ($job) {
 	&lock_file(&cron::cron_file($job));
 	&cron::delete_cron_job($job);