diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index de2f07fa4..3383b63eb 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -288,12 +288,16 @@ void RandomizerOnSceneFlagSetHandler(int16_t sceneNum, int16_t flagType, int16_t
                 break;
 
             case SCENE_FOREST_TEMPLE:
-                if (!isVanilla && flag == 0x21) {
-                    Flags_SetRandomizerInf(RAND_INF_FOREST_MQ_NORTH_WEST_EYE);
+                if (flag == 0x26) {
+                    Flags_SetRandomizerInf(RAND_INF_FOREST_DRAINED_WELL);
+                } else if (isVanilla && flag == 0x25) {
+                    Flags_SetRandomizerInf(RAND_INF_FOREST_LOBBY_EYES);
+                } else if (!isVanilla && flag == 0x21) {
+                    Flags_SetRandomizerInf(RAND_INF_FOREST_LOBBY_EYES);
                 } else if (!isVanilla && flag == 0x25) {
                     Flags_SetRandomizerInf(RAND_INF_FOREST_MQ_COURTYARD_WEB_BURNT);
                 } else if (!isVanilla && flag == 0x2a) {
-                    Flags_SetRandomizerInf(RAND_INF_FOREST_MQ_NORTH_EAST_EYE);
+                    Flags_SetRandomizerInf(RAND_INF_FOREST_LOBBY_EYES);
                 }
                 break;
 
@@ -1927,12 +1931,15 @@ void RandomizerOnActorInitHandler(void* actorRef) {
                 break;
 
             case SCENE_FOREST_TEMPLE:
-                if (!isVanilla && Flags_GetRandomizerInf(RAND_INF_FOREST_MQ_NORTH_WEST_EYE)) {
+                if (Flags_GetRandomizerInf(RAND_INF_FOREST_DRAINED_WELL)) {
+                    Flags_SetSwitch(gPlayState, 0x26);
+                } else if (isVanilla && Flags_GetRandomizerInf(RAND_INF_FOREST_LOBBY_EYES)) {
+                    Flags_SetSwitch(gPlayState, 0x25);
+                } else if (!isVanilla && Flags_GetRandomizerInf(RAND_INF_FOREST_LOBBY_EYES)) {
                     Flags_SetSwitch(gPlayState, 0x21);
+                    Flags_SetSwitch(gPlayState, 0x2a);
                 } else if (!isVanilla && Flags_GetRandomizerInf(RAND_INF_FOREST_MQ_COURTYARD_WEB_BURNT)) {
                     Flags_SetSwitch(gPlayState, 0x25);
-                } else if (!isVanilla && Flags_GetRandomizerInf(RAND_INF_FOREST_MQ_NORTH_EAST_EYE)) {
-                    Flags_SetSwitch(gPlayState, 0x2a);
                 }
                 break;
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 97c6a7e4a..c4898069b 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -1094,8 +1094,8 @@ DEFINE_RAND_INF(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN)
 DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_TORCH_SWITCH)
 DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_SILVER_RUPEES)
 DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_FIRST_SWITCH)
-DEFINE_RAND_INF(RAND_INF_FOREST_MQ_NORTH_WEST_EYE)
-DEFINE_RAND_INF(RAND_INF_FOREST_MQ_NORTH_EAST_EYE)
+DEFINE_RAND_INF(RAND_INF_FOREST_LOBBY_EYES)
+DEFINE_RAND_INF(RAND_INF_FOREST_DRAINED_WELL)
 DEFINE_RAND_INF(RAND_INF_FOREST_MQ_COURTYARD_WEB_BURNT)
 DEFINE_RAND_INF(RAND_INF_FIRE_MQ_LOBBY_TORCHES)
 DEFINE_RAND_INF(RAND_INF_SPIRIT_SUN_ON_FLOOR_ON)