diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm
index e71da40ccd1..c462cc7d494 100644
--- a/code/defines/obj/computer.dm
+++ b/code/defines/obj/computer.dm
@@ -130,15 +130,6 @@
 	var/list/connected_doors
 	var/department		//each department has a hardcoded list of possible door networks
 
-/obj/machinery/computer/crew
-	name = "Crew monitoring computer"
-	desc = "Used to monitor active health sensors built into most of the crew's uniforms."
-	icon_state = "crew"
-	use_power = 1
-	idle_power_usage = 250
-	active_power_usage = 500
-	circuit = "/obj/item/weapon/circuitboard/crew"
-	var/list/tracked =	list(  )
 
 /*/obj/machinery/computer/scan_consolenew    //Coming Soon, I highly doubt this but Ill leave it here anyways
 	name = "DNA Modifier Access Console"
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 382c267cbbe..319c5f0a7db 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -1,4 +1,14 @@
 /obj/machinery/computer/crew
+	name = "Crew monitoring computer"
+	desc = "Used to monitor active health sensors built into most of the crew's uniforms."
+	icon_state = "crew"
+	use_power = 1
+	idle_power_usage = 250
+	active_power_usage = 500
+	circuit = "/obj/item/weapon/circuitboard/crew"
+	var/list/tracked = list(  )
+
+
 	New()
 		tracked = list()
 		..()
@@ -46,8 +56,8 @@
 
 	proc
 		interact(mob/user)
-			if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
-				if (!istype(user, /mob/living/silicon))
+			if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
+				if(!istype(user, /mob/living/silicon))
 					user.machine = null
 					user << browse(null, "window=powcomp")
 					return
@@ -58,33 +68,31 @@
 			t += "<BR><A href='?src=\ref[src];close=1'>Close</A>"
 			t += "<table><tr><td>Name</td><td>Vitals</td><td>Position</td></tr>"
 			for(var/obj/item/clothing/under/C in src.tracked)
-				if((C) && (C.has_sensor) && (C.loc) && (C.loc.z == 1))
+				if((C) && (C.has_sensor) && (C.loc) && (C.loc.z == 1) && C.sensor_mode)
 					if(istype(C.loc, /mob/living/carbon/human))
 						var/mob/living/carbon/human/H = C.loc
 						var/dam1 = round(H.getOxyLoss(),1)
 						var/dam2 = round(H.getToxLoss(),1)
 						var/dam3 = round(H.getFireLoss(),1)
 						var/dam4 = round(H.getBruteLoss(),1)
+
+						if(H.wear_id)
+							t += "<tr><td>[H.wear_id.name]</td>"
+						else
+							t += "<tr><td>Unknown:</td>"
 						switch(C.sensor_mode)
 							if(1)
-								if(H.wear_id)
-									t += "<tr><td>[H.wear_id.name]</td><td>"
-								else
-									t += "<tr><td>Unknown:</td><td>"
-								t+= "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]</td><td>Not Available</td></tr>"
+								t+= "<td>[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]</td><td>Not Available</td></tr>"
 							if(2)
-								if(H.wear_id)
-									t += "<tr><td>[H.wear_id.name]</td><td>"
-								else
-									t += "<tr><td>Unknown:</td><td>"
-								t += "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"], [dam1] - [dam2] - [dam3] - [dam4]</td><td>Not Available</td></tr>"
+								t += "<td>[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"], [dam1] - [dam2] - [dam3] - [dam4]</td><td>Not Available</td></tr>"
 							if(3)
-								t += "<tr><td>[H.name]</td><td>[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"], [dam2] - [dam2] - [dam3] - [dam4]</td><td>[get_area(H)] ([H.x], [H.y])</td></tr>"
+								t += "<td>[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"], [dam2] - [dam2] - [dam3] - [dam4]</td><td>[get_area(H)] ([H.x], [H.y])</td></tr>"
 			t += "</table>"
 			t += "</FONT></PRE></TT>"
-			user << browse(t, "window=crewcomp;size=500x800")
+			user << browse(t, "window=crewcomp;size=900x600")
 			onclose(user, "crewcomp")
 
+
 		scan()
 			for(var/obj/item/clothing/under/C in world)
 				if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human)))