diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm
index fbb6fcab27..927fdf715c 100644
--- a/code/modules/clothing/glasses/night.dm
+++ b/code/modules/clothing/glasses/night.dm
@@ -102,6 +102,28 @@
 	req_skill_level = SKILL_SPEC_SMARTGUN
 
 	var/far_sight = FALSE
+	var/list/smartgun_head_ban = list(/obj/item/clothing/head/helmet/marine)
+	var/obj/structure/machinery/camera/camera
+	/obj/item/clothing/glasses/night/m56_goggles/proc/check_equipping(mob/living/carbon/human/equipping_human, obj/item/equipping_item, slot)
+	SIGNAL_HANDLER
+
+	if(slot != WEAR_HEAD)
+		return
+
+
+	if(is_type_in_list(equipping_item, smartgun_head_ban))
+		return
+
+	. = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP
+
+	if(equipping_item.flags_equip_slot == SLOT_BACK)
+		to_chat(equipping_human, SPAN_WARNING("You can't equip [equipping_item] on your back while wearing [src]."))
+		return
+
+/obj/item/clothing/suit/storage/marine/smartgunner/unequipped(mob/user, slot)
+	. = ..()
+
+	UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP)
 	var/obj/item/weapon/gun/smartgun/linked_smartgun = null
 
 /obj/item/clothing/glasses/night/m56_goggles/Destroy()
diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm
index 906473056e..d7afd52fc6 100644
--- a/code/modules/defenses/sentry_computer.dm
+++ b/code/modules/defenses/sentry_computer.dm
@@ -2,8 +2,8 @@
  * Sentry gun computer which links to defensive structures.
  */
 /obj/item/device/sentry_computer
-	name = "\improper Sentry Gun Network Laptop"
-	desc = "A laptop loaded with sentry control software."
+	name = "\improper AN/PSQ-55 Remote Weapons Console"
+	desc = "A TREE hardened laptop equipped with additional C2 software for the UA-571 family of robot sentries."
 	icon = 'icons/obj/structures/props/sentrycomp.dmi'
 	icon_state = "sentrycomp_cl"
 	w_class = SIZE_SMALL