diff --git a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala
index a5156537..2041d88d 100644
--- a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala
+++ b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala
@@ -833,7 +833,7 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex
     pkt match {
 
       case OutfitRequest(_, OutfitRequestAction.Motd(message)) =>
-        SessionOutfitHandlers.HandleOutfitMotd(zones, message, player)
+        //SessionOutfitHandlers.HandleOutfitMotd(zones, message, player)
 
       case OutfitRequest(_, OutfitRequestAction.Ranks(List(r1, r2, r3, r4, r5, r6, r7, r8))) =>
         SessionOutfitHandlers.HandleOutfitRank(zones, List(r1, r2, r3, r4, r5, r6, r7, r8), player)
diff --git a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala
index 89443524..4c6203ea 100644
--- a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala
+++ b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala
@@ -41,7 +41,13 @@ class HackCaptureActor extends Actor {
 
     case HackCaptureActor.StartCaptureTerminalHack(target, zone, unk1, unk2, startTime) =>
       log.trace(s"StartCaptureTerminalHack: ${target.GUID} is hacked")
-      val duration = target.Definition.FacilityHackTime
+      val hackingFaction = HackCaptureActor.GetHackingFaction(target).get
+      val duration = target.Owner match {
+          case b: Building if b.IsCtfBase && b.Neighbours(hackingFaction).nonEmpty =>
+            15.minutes
+          case _ =>
+            target.Definition.FacilityHackTime
+        }
       target.HackedBy.map {
         hackInfo => target.HackedBy = hackInfo.Duration(duration.toMillis)
       }