diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index c96a1b0b325..993ba4d802f 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -89,6 +89,9 @@
 	return 1
 
 /obj/machinery/atmospherics/binary/passive_gate/interact(mob/user)
+	user.set_machine(src)
+	add_fingerprint(user)
+
 	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
 				<b>Desirable output pressure: </b>
 				[round(target_pressure,0.1)]kPa | <a href='?src=[UID()];set_press=1'>Change</a>
@@ -134,16 +137,14 @@
 /obj/machinery/atmospherics/binary/passive_gate/attack_hand(mob/user)
 	if(..())
 		return
-	add_fingerprint(user)
+
 	if(!allowed(user))
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
-	user.set_machine(src)
+
 	interact(user)
 	
 /obj/machinery/atmospherics/binary/passive_gate/attack_ghost(mob/user)
-	add_fingerprint(user)
-	user.set_machine(src)
 	interact(user)
 
 /obj/machinery/atmospherics/binary/passive_gate/Topic(href,href_list)
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 40faf440cfd..824d3b1c5f0 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -104,6 +104,9 @@ Thus, the two variables affect pump operation are set in New():
 	return 1
 
 /obj/machinery/atmospherics/binary/pump/interact(mob/user)
+	user.set_machine(src)
+	add_fingerprint(user)
+
 	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
 				<b>Desirable output pressure: </b>
 				[round(target_pressure,0.1)]kPa | <a href='?src=[UID()];set_press=1'>Change</a>
@@ -154,16 +157,14 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/binary/pump/attack_hand(mob/user)
 	if(..())
 		return
-	add_fingerprint(user)
+
 	if(!allowed(user))
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
-	user.set_machine(src)
+
 	interact(user)
 	
 /obj/machinery/atmospherics/binary/pump/attack_ghost(mob/user)
-	add_fingerprint(user)
-	user.set_machine(src)
 	interact(user)
 
 /obj/machinery/atmospherics/binary/pump/Topic(href,href_list)
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index 12982820b84..99465e15d88 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -100,6 +100,9 @@ Thus, the two variables affect pump operation are set in New():
 	return 1
 
 /obj/machinery/atmospherics/binary/volume_pump/interact(mob/user)
+	user.set_machine(src)
+	add_fingerprint(user)
+
 	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
 				<b>Desirable output flow: </b>
 				[round(transfer_rate,1)]l/s | <a href='?src=[UID()];set_transfer_rate=1'>Change</a>
@@ -145,16 +148,14 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/binary/volume_pump/attack_hand(mob/user)
 	if(..())
 		return
-	add_fingerprint(user)
+
 	if(!allowed(user))
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
-	user.set_machine(src)
+
 	interact(user)
 	
 /obj/machinery/atmospherics/binary/volume_pump/attack_ghost(mob/user)
-	add_fingerprint(user)
-	user.set_machine(src)
 	interact(user)
 
 /obj/machinery/atmospherics/binary/volume_pump/Topic(href,href_list)
diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
index cacc1e8b9a0..2eca090d086 100644
--- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
@@ -127,7 +127,6 @@
 	ui_interact(user)
 
 /obj/machinery/atmospherics/omni/attack_ghost(mob/user)
-	add_fingerprint(usr)
 	ui_interact(user)
 	
 /obj/machinery/atmospherics/omni/proc/build_icons()
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index c916848797e..b8ecae86b85 100755
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -148,23 +148,22 @@ Filter types:
 	..()
 	
 /obj/machinery/atmospherics/trinary/filter/attack_ghost(mob/user) 
-	add_fingerprint(user)
-	user.set_machine(src)
 	interact(user)
 
 /obj/machinery/atmospherics/trinary/filter/attack_hand(mob/user)
 	if(..())
 		return
 
-	add_fingerprint(user)
 	if(!allowed(user))
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
 		
-	user.set_machine(src)
 	interact(user)
 		
-/obj/machinery/atmospherics/trinary/filter/interact(mob/user)		
+/obj/machinery/atmospherics/trinary/filter/interact(mob/user)	
+	user.set_machine(src)
+	add_fingerprint(user)
+	
 	var/dat
 	var/current_filter_type
 	switch(filter_type)
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index d1b304f072a..f859175cdb2 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -109,24 +109,21 @@
 	return 1
 	
 /obj/machinery/atmospherics/trinary/mixer/attack_ghost(mob/user) 
-	add_fingerprint(user)
-	user.set_machine(src)
 	interact(user)
 
 /obj/machinery/atmospherics/trinary/mixer/attack_hand(mob/user)
 	if(..())
 		return
 
-	add_fingerprint(user)
 	if(!allowed(user))
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
 		
-	user.set_machine(src)
 	interact(user)
 	
 /obj/machinery/atmospherics/trinary/mixer/interact(mob/user)	
-	usr.set_machine(src)
+	user.set_machine(src)
+	add_fingerprint(user)
 	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
 				<b>Desirable output pressure: </b>
 				[target_pressure]kPa | <a href='?src=[UID()];set_press=1'>Change</a>
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 4a5190bac39..ce393c16e15 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -156,6 +156,7 @@
 	if(stat & BROKEN || panel_open)
 		return
 	user.set_machine(src)
+	add_fingerprint(user)
 	var/dat
 	if(processing)
 		dat += "<div class='statusDisplay'>Biogenerator is processing! Please wait...</div><BR>"
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index 70eec9ae078..95e195caaf7 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -95,6 +95,7 @@
 	interact(user)
 
 /obj/machinery/plantgenes/interact(mob/user)
+	add_fingerprint(user)
 	user.set_machine(src)
 	if(!user)
 		return
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index 631e2ff7321..379a15a296a 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -133,6 +133,7 @@
 	if(stat)
 		return 0
 		
+	add_fingerprint(user)
 	user.set_machine(src)
 
 	var/dat = "<b>Stored seeds:</b><br>"