diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
index 95502b190..f30759472 100644
--- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
+++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
@@ -2532,7 +2532,9 @@ class ZoningOperations(
             sessionLogic.general.toggleTeleportSystem(obj, TelepadLike.AppraiseTeleportationSystem(obj, continent))
           }
       }
-      SessionOutfitHandlers.HandleLoginOutfitCheck(player, sessionLogic)
+      if (player.outfit_id == 0) {
+        SessionOutfitHandlers.HandleLoginOutfitCheck(player, sessionLogic)
+      }
       //make weather happen
       sendResponse(WeatherMessage(List(),List(
         StormInfo(Vector3(0.1f, 0.15f, 0.0f), 240, 217),
diff --git a/src/main/scala/net/psforever/services/chat/ChatService.scala b/src/main/scala/net/psforever/services/chat/ChatService.scala
index 53c105f95..68fc0edbb 100644
--- a/src/main/scala/net/psforever/services/chat/ChatService.scala
+++ b/src/main/scala/net/psforever/services/chat/ChatService.scala
@@ -58,8 +58,8 @@ class ChatService(context: ActorContext[ChatService.Command]) extends AbstractBe
           case (SquadChannel(_), CMT_SQUAD)                                      => ()
           case (SquadChannel(_), CMT_VOICE) if message.contents.startsWith("SH") => ()
           case (OutfitChannel(_), CMT_OUTFIT)                                    => ()
-          case (DefaultChannel, messageType) if messageType != CMT_SQUAD         => ()
-          case (SpectatorChannel, messageType) if messageType != CMT_SQUAD       => ()
+          case (DefaultChannel, messageType) if messageType != CMT_SQUAD && messageType != CMT_OUTFIT => ()
+          case (SpectatorChannel, messageType) if messageType != CMT_SQUAD && messageType != CMT_OUTFIT => ()
           case _ =>
             log.error(s"invalid chat channel $channel for messageType ${message.messageType}")
             return this