diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index daceed21118837e1d99d5a43288d0364049b5f0d..9551e819aaffc725427114cfcb908839bff62397 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -17,6 +17,22 @@ window.assignJob = function assignJob(slave, job) {
 		V[propName] = slave;
 	};
 
+	/* Tracking for the following cases: */
+	switch (job.toLowerCase()) {
+		case "be confined in the cellblock":
+		case "cellblock":
+		case "get treatment in the clinic":
+		case "clinic":
+		case "learn in the schoolroom":
+		case "schoolroom":
+		case "rest in the spa":
+		case "spa":
+			if (oldJob !== "rest") {
+				V.assignmentRecords[slave.ID] = oldJob; // these jobs are temporary, so we save what the slave will return to if it is meaningful.
+			}
+			break;
+	}
+
 	/* use .toLowerCase() to get rid of a few dupe conditions. */
 	switch (job.toLowerCase()) {
 		case "be confined in the arcade":
@@ -48,9 +64,6 @@ window.assignJob = function assignJob(slave, job) {
 
 		case "be confined in the cellblock":
 		case "cellblock":
-			if (oldJob !== "rest") {
-				V.assignmentRecords[slave.ID] = oldJob;
-			}
 			slave.assignment = "be confined in the cellblock";
 			V.CellBiIDs.push(slave.ID);
 			switch (V.cellblockDecoration) {
@@ -65,9 +78,6 @@ window.assignJob = function assignJob(slave, job) {
 
 		case "get treatment in the clinic":
 		case "clinic":
-			if (oldJob !== "rest") {
-				V.assignmentRecords[slave.ID] = oldJob;
-			}
 			slave.assignment = "get treatment in the clinic";
 			V.CliniciIDs.push(slave.ID);
 			switch (V.clinicDecoration) {
@@ -179,9 +189,6 @@ window.assignJob = function assignJob(slave, job) {
 
 		case "learn in the schoolroom":
 		case "schoolroom":
-			if (oldJob !== "rest") {
-				V.assignmentRecords[slave.ID] = oldJob;
-			}
 			slave.assignment = "learn in the schoolroom";
 			V.SchlRiIDs.push(slave.ID);
 			slave.rules.living = "normal";
@@ -234,9 +241,6 @@ window.assignJob = function assignJob(slave, job) {
 
 		case "rest in the spa":
 		case "spa":
-			if (oldJob !== "rest") {
-				V.assignmentRecords[slave.ID] = oldJob;
-			}
 			slave.assignment = "rest in the spa";
 			V.SpaiIDs.push(slave.ID);
 			switch (V.spaDecoration) {