diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 044c6a562ac..96181c6ee57 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -208,7 +208,7 @@
 	var/lighting_alpha
 
 	var/list/color_view = null//overrides client.color while worn
-	var/prescription = 0
+	var/prescription = FALSE
 	var/prescription_upgradable = FALSE
 	var/over_mask = FALSE //Whether or not the eyewear is rendered above the mask. Purely cosmetic.
 	strip_delay = 20			//	   but seperated to allow items to protect but not impair vision, like space helmets
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 83f236ba6ea..37e1d2b9f9e 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -1,8 +1,7 @@
 /obj/item/clothing/glasses/Initialize(mapload)
 	. = ..()
 	if(prescription_upgradable && prescription)
-		// Pre-upgraded upgradable glasses
-		name = "prescription [name]"
+		upgrade_prescription()
 
 /obj/item/clothing/glasses/attackby(obj/item/I, mob/user)
 	if(!prescription_upgradable || user.stat || user.restrained() || !ishuman(user))
@@ -15,25 +14,41 @@
 			to_chat(H, "<span class='warning'>You can't possibly imagine how adding more lenses would improve [src].</span>")
 			return
 		H.unEquip(I)
-		I.loc = src // Store the glasses for later removal
+		upgrade_prescription(I)
 		to_chat(H, "<span class='notice'>You fit [src] with lenses from [I].</span>")
-		prescription = TRUE
-		name = "prescription [initial(name)]"
 
 	// Removing prescription glasses
 	H.update_nearsighted_effects()
 
-/obj/item/clothing/glasses/screwdriver_act(mob/living/user, obj/item/I)
-	if(!prescription)
+/obj/item/clothing/glasses/proc/upgrade_prescription(obj/item/I)
+	if(!I)
+		new /obj/item/clothing/glasses/regular(src)
+	else
+		I.forceMove(src)
+	prescription = TRUE
+	name = "prescription [initial(name)]"
+
+/obj/item/clothing/glasses/proc/remove_prescription(mob/living/user)
+	var/obj/item/clothing/glasses/regular/prescription_glasses = locate() in src
+
+	if(!prescription_glasses)
 		return
-	var/obj/item/clothing/glasses/regular/G = locate() in src
-	if(!G)
-		G = new(src)
-	to_chat(user, "<span class='notice'>You salvage the prescription lenses from [src].</span>")
+
 	prescription = FALSE
 	name = initial(name)
-	user.put_in_hands(G)
-	user.update_nearsighted_effects()
+
+	if(user)
+		to_chat(user, "<span class='notice'>You salvage the prescription lenses from [src].</span>")
+		user.put_in_hands(prescription_glasses)
+		user.update_nearsighted_effects()
+	else
+		prescription_glasses.forceMove(get_turf(src))
+
+/obj/item/clothing/glasses/screwdriver_act(mob/living/user)
+	if(!prescription)
+		to_chat(user, "<span class='notice'>There are no prescription lenses in [src].</span>")
+		return
+	remove_prescription(user)
 	return TRUE
 
 /obj/item/clothing/glasses/update_icon_state()
@@ -106,7 +121,7 @@
 	prescription_upgradable = FALSE
 
 /obj/item/clothing/glasses/meson/prescription
-	prescription = 1
+	prescription = TRUE
 
 /obj/item/clothing/glasses/meson/gar
 	name = "gar mesons"
@@ -439,7 +454,7 @@
 	tint = FLASH_PROTECTION_NONE
 
 /obj/item/clothing/glasses/sunglasses/prescription
-	prescription = 1
+	prescription = TRUE
 
 /obj/item/clothing/glasses/sunglasses/big
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
diff --git a/code/modules/clothing/glasses/hudglasses.dm b/code/modules/clothing/glasses/hudglasses.dm
index 7c060132904..c8e09bb0a4d 100644
--- a/code/modules/clothing/glasses/hudglasses.dm
+++ b/code/modules/clothing/glasses/hudglasses.dm
@@ -144,7 +144,7 @@
 	)
 
 /obj/item/clothing/glasses/hud/security/sunglasses/prescription
-	prescription = 1
+	prescription = TRUE
 
 /obj/item/clothing/glasses/hud/hydroponic
 	name = "hydroponic HUD"