diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index e8504d09b0c..35cf9111aad 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1260,6 +1260,11 @@ var/list/preferences_datums = list()
 	character.age = age
 
 	character.eye_color = eye_color
+	var/obj/item/organ/eyes/organ_eyes = character.getorgan(/obj/item/organ/eyes)
+	if(organ_eyes)
+		if(!initial(organ_eyes.eye_color))
+			organ_eyes.eye_color = eye_color
+		organ_eyes.old_eye_color = eye_color
 	character.hair_color = hair_color
 	character.facial_hair_color = facial_hair_color
 
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 0bb05e5f06b..6886da75939 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -749,18 +749,21 @@
 	var/sight_flags = 0
 	var/see_in_dark = 2
 	var/tint = 0
-	var/eye_color = "fff"
+	var/eye_color = "" //set to a hex code to override a mob's eye color
 	var/old_eye_color = "fff"
 	var/flash_protect = 0
 	var/see_invisible = SEE_INVISIBLE_LIVING
 
 /obj/item/organ/eyes/Insert(mob/living/carbon/M, special = 0)
 	..()
-	if(ishuman(owner) && eye_color)
+	if(ishuman(owner))
 		var/mob/living/carbon/human/HMN = owner
 		old_eye_color = HMN.eye_color
-		HMN.eye_color = eye_color
-		HMN.regenerate_icons()
+		if(eye_color)
+			HMN.eye_color = eye_color
+			HMN.regenerate_icons()
+		else
+			eye_color = HMN.eye_color
 	M.update_tint()
 	owner.update_sight()