diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm
index 5cc90c9558..07d49030f7 100644
--- a/code/modules/economy/cash_register.dm
+++ b/code/modules/economy/cash_register.dm
@@ -400,19 +400,19 @@
 
 	if(usr.stat) return
 
-	if(cash_locked)
-		usr << "<span class='warning'>The cash box is locked.</span>"
-	else if(cash_open)
+	if(cash_open)
 		cash_open = 0
 		overlays -= "register_approve"
 		overlays -= "register_open"
 		overlays -= "register_cash"
-	else
+	else if(!cash_locked)
 		cash_open = 1
 		overlays += "register_approve"
 		overlays += "register_open"
 		if(cash_stored)
 			overlays += "register_cash"
+	else
+		usr << "<span class='warning'>The cash box is locked.</span>"
 
 
 /obj/machinery/cash_register/proc/toggle_anchors(obj/item/weapon/wrench/W, mob/user)
diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm
index 322173ad87..88fd72acf2 100644
--- a/code/modules/economy/retail_scanner.dm
+++ b/code/modules/economy/retail_scanner.dm
@@ -3,8 +3,11 @@
 	desc = "Swipe your ID card to make purchases electronically."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "retail_idle"
-	flags = NOBLUDGEON
+	flags = NOBLUDGEON|CONDUCT
+	slot_flags = SLOT_BELT
 	req_access = list(access_heads)
+	w_class = 2.0
+	origin_tech = list(TECH_MATERIAL = 1)
 
 	var/locked = 1
 	var/emagged = 0
@@ -139,6 +142,11 @@
 		scan_item_price(O)
 
 
+/obj/item/device/retail_scanner/showoff(mob/user)
+	for (var/mob/M in view(user))
+		M.show_message("[user] holds up [src]. <a HREF=?src=\ref[M];clickitem=\ref[src]>Swipe card or item.</a>",1)
+
+
 /obj/item/device/retail_scanner/proc/confirm(var/obj/item/I)
 	if(confirm_item == I)
 		return 1
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a3b5426086..014d15a0c4 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -616,6 +616,11 @@
 		var/mob/M = locate(href_list["lookmob"])
 		src.examinate(M)
 
+	if (href_list["clickitem"])
+		var/obj/item/I = locate(href_list["clickitem"])
+		if(src.client)
+			src.ClickOn(I)
+
 	if (href_list["flavor_change"])
 		switch(href_list["flavor_change"])
 			if("done")