diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 4fc05d7ef41..f802260196d 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -26,6 +26,7 @@
 			dat += text("<A href='?src=\ref[src];id=eject'>[inserted_id]</A><br>")
 			dat += text("Collected Points: [inserted_id.points]. <A href='?src=\ref[src];id=reset'>Reset.</A><br>")
 			dat += text("Card goal: [inserted_id.goal].  <A href='?src=\ref[src];id=setgoal'>Set </A><br>")
+			dat += text("Space Law recommends sentences of 100 points per minute they would normally serve in the brig.<BR>")
 		else
 			dat += text("<A href='?src=\ref[src];id=insert'>Insert Prisoner ID.</A><br>")
 		dat += "<H3>Prisoner Implant Management</H3>"
@@ -105,6 +106,7 @@
 					if("setgoal")
 						var/num = round(input(usr, "Choose prisoner's goal:", "Input an Integer", null) as num|null)
 						if(num >= 0)
+							num = min(num,1000) //Cap the quota to the equivilent of 10 minutes.
 							inserted_id.goal = num
 		else if(href_list["inject1"])
 			var/obj/item/weapon/implant/I = locate(href_list["inject1"])
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index 81c682355d5..645dd8d9772 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -40,7 +40,7 @@
 	else if(istype(inserted_id)) //There's an ID in there.
 		dat += text("ID: [inserted_id.registered_name] <A href='?src=\ref[src];choice=eject'>Eject ID.</A><br>")
 		dat += text("Points Collected:[inserted_id.points]<br>")
-		dat += text("Point Quota: [inserted_id.goal ? inserted_id.goal : "Unlimited"] - Reach your quota to earn your release<br>")
+		dat += text("Point Quota: [inserted_id.goal] - Reach your quota to earn your release<br>")
 		dat += text("Unclaimed Collection Points: [machine.points].  <A href='?src=\ref[src];choice=claim'>Claim points.</A><br>")
 	else	//No ID in sight.  Complain about it.
 		dat += text("No ID inserted.  <A href='?src=\ref[src];choice=insert'>Insert ID.</A><br>")
@@ -157,7 +157,7 @@
 			var/obj/item/weapon/card/id/prisoner/prisoner_id = I
 			user << "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>"
 			user << "<span class='notice'>Points Collected:[prisoner_id.points]</span>"
-			user << "<span class='notice'>Point Quota: [prisoner_id.goal ? prisoner_id.goal : "Unlimited"]</span>"
+			user << "<span class='notice'>Point Quota: [prisoner_id.goal]</span>"
 			user << "<span class='notice'>Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.</span>"
 		else
 			user << "<span class='warning'>Error: Invalid ID</span>"