diff --git a/mysql/create_tables.sql b/mysql/create_tables.sql
index 3ce99fbf..d134ab5c 100644
--- a/mysql/create_tables.sql
+++ b/mysql/create_tables.sql
@@ -215,6 +215,8 @@ CREATE TRIGGER mxq_update_job BEFORE UPDATE ON mxq_job
                    group_mtime=NULL
                 WHERE group_id=NEW.group_id;
             ELSEIF NEW.job_status = 990 AND OLD.job_status IN (0, 100, 989) THEN
+                SET NEW.date_start = NOW();
+                SET NEW.date_end = NEW.date_start;
                 UPDATE mxq_group SET
                    group_jobs_inq=group_jobs_inq-1,
                    group_jobs_cancelled=group_jobs_cancelled+1,
diff --git a/mysql/fix_cancelled_job_dates.sql b/mysql/fix_cancelled_job_dates.sql
new file mode 100644
index 00000000..4a935764
--- /dev/null
+++ b/mysql/fix_cancelled_job_dates.sql
@@ -0,0 +1,8 @@
+UPDATE mxq_job
+    JOIN mxq_group
+        ON mxq_job.group_id = mxq_group.group_id
+    SET mxq_job.date_start = mxq_group.group_date_end,
+        mxq_job.date_end = mxq_group.group_date_end
+    WHERE job_status = 990
+        AND (date_start = 0 OR date_end = 0);
+