diff --git a/LogWatcher.cs b/LogWatcher.cs
index e10681bd..5d68f54c 100644
--- a/LogWatcher.cs
+++ b/LogWatcher.cs
@@ -338,7 +338,7 @@ namespace VRCX
                 return true;
             }
 
-            if (line.Contains("] Joining ") && !line.Contains("or Creating Room: "))
+            if (line.Contains("] Joining ") && !line.Contains("] Joining or Creating Room: ") && !line.Contains("] Joining friend: "))
             {
                 var lineOffset = line.LastIndexOf("] Joining ");
                 if (lineOffset < 0)
diff --git a/html/src/app.js b/html/src/app.js
index 2115a47e..76aa24ff 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -8759,18 +8759,18 @@ speechSynthesis.getVoices();
     $app.methods.checkPhotonBotLeave = function (photonId, gameLogDate) {
         var text = '';
         var lobbyJointime = this.photonLobbyJointime.get(photonId);
-        if (
-            typeof lobbyJointime !== 'undefined' &&
-            !lobbyJointime.hasInstantiated
-        ) {
-            var time = timeToText(Date.now() - lobbyJointime.joinTime);
-            text = `Left without instantiating ${time}`;
-        } else if (this.photonLobbyBots.includes(photonId)) {
+        if (this.photonLobbyBots.includes(photonId)) {
             var text = 'Photon bot has left';
             if (typeof lobbyJointime !== 'undefined') {
                 var time = timeToText(Date.now() - lobbyJointime.joinTime);
                 text = `Photon bot has left ${time}`;
             }
+        } else if (
+            typeof lobbyJointime !== 'undefined' &&
+            !lobbyJointime.hasInstantiated
+        ) {
+            var time = timeToText(Date.now() - lobbyJointime.joinTime);
+            text = `Left without instantiating ${time}`;
         }
         if (text) {
             this.addEntryPhotonEvent({
@@ -8824,6 +8824,9 @@ speechSynthesis.getVoices();
         };
         this.photonLobby.set(photonId, photonUser);
         this.photonLobbyCurrent.set(photonId, photonUser);
+        if (!hasJoined) {
+            this.photonUserJoin(photonId, photonUser, gameLogDate);
+        }
 
         var bias = Date.parse(gameLogDate) + 60 * 1000; // 1min
         if (bias > Date.now()) {
@@ -8868,13 +8871,14 @@ speechSynthesis.getVoices();
                 this.photonModerationUpdate(ref, block, mute, gameLogDate);
             }
         }
-        if (!hasJoined) {
-            this.photonUserJoin(photonId, ref, gameLogDate);
-        }
     };
 
     $app.methods.photonUserJoin = function (photonId, ref, gameLogDate) {
-        if (ref.id === API.currentUser.id) {
+        if (
+            typeof ref === 'undefined' ||
+            ref.id === API.currentUser.id ||
+            !this.photonEventOverlayJoinLeave
+        ) {
             return;
         }
         this.addEntryPhotonEvent({
@@ -8885,6 +8889,9 @@ speechSynthesis.getVoices();
     };
 
     $app.methods.photonUserLeave = function (photonId, gameLogDate) {
+        if (!this.photonEventOverlayJoinLeave) {
+            return;
+        }
         this.addEntryPhotonEvent({
             photonId,
             text: 'has left',
@@ -10932,6 +10939,9 @@ speechSynthesis.getVoices();
     $app.data.photonEventOverlayFilter = configRepository.getString(
         'VRCX_PhotonEventOverlayFilter'
     );
+    $app.data.photonEventOverlayJoinLeave = configRepository.getBool(
+        'VRCX_PhotonEventOverlayJoinLeave'
+    );
     $app.methods.saveEventOverlay = function () {
         configRepository.setBool(
             'VRCX_PhotonEventOverlay',
@@ -10949,6 +10959,10 @@ speechSynthesis.getVoices();
             'VRCX_PhotonEventOverlayFilter',
             this.photonEventOverlayFilter
         );
+        configRepository.setBool(
+            'VRCX_PhotonEventOverlayJoinLeave',
+            this.photonEventOverlayJoinLeave
+        );
         if (!this.timeoutHudOverlay) {
             AppApi.ExecuteVrOverlayFunction('updateHudTimeout', '[]');
         }
@@ -11066,6 +11080,13 @@ speechSynthesis.getVoices();
             $app.data.photonEventOverlayFilter
         );
     }
+    if (!configRepository.getBool('VRCX_PhotonEventOverlayJoinLeave')) {
+        $app.data.photonEventOverlayJoinLeave = false;
+        configRepository.setBool(
+            'VRCX_PhotonEventOverlayJoinLeave',
+            $app.data.photonEventOverlayJoinLeave
+        );
+    }
     if (!configRepository.getString('sharedFeedFilters')) {
         var sharedFeedFilters = {
             noty: {
diff --git a/html/src/index.pug b/html/src/index.pug
index b452d64a..d5eb2071 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -1099,6 +1099,9 @@ html
                     div.options-container-item
                         span.name Enable
                         el-switch(v-model="photonEventOverlay" @change="saveEventOverlay" :disabled="!openVR")
+                    div.options-container-item
+                        span.name Show Join/Leave
+                        el-switch(v-model="photonEventOverlayJoinLeave" @change="saveEventOverlay" :disabled="!openVR")
                     div.options-container-item
                         span.name Filter
                         el-radio-group(v-model="photonEventOverlayFilter" @change="saveEventOverlay" size="mini" :disabled="!openVR || !photonEventOverlay")