diff --git a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
index b9e4a38660..2fe56fcce9 100644
--- a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
+++ b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
@@ -153,7 +153,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
             }
         }
         else if (state == VisualState.OverlayCharging)
-            sprite.LayerSetState(DisposalUnitVisualLayers.OverlayFlush, new RSI.StateId("disposal-charging"));
+            sprite.LayerSetState(DisposalUnitVisualLayers.OverlayFlush, chargingState);
         else
             _animationSystem.Stop(uid, AnimationKey);
 
diff --git a/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs b/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs
index 797e20ae7d..489d749a0c 100644
--- a/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs
@@ -2,6 +2,7 @@ using Content.Shared.Disposal;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Disposal.UI
 {
@@ -11,6 +12,8 @@ namespace Content.Client.Disposal.UI
     [GenerateTypedNameReferences]
     public sealed partial class MailingUnitWindow : DefaultWindow
     {
+        public TimeSpan FullPressure;
+
         public MailingUnitWindow()
         {
             RobustXamlLoader.Load(this);
@@ -26,6 +29,7 @@ namespace Content.Client.Disposal.UI
 
             Title = Loc.GetString("ui-mailing-unit-window-title", ("tag", state.Tag ?? " "));
             UnitState.Text = disposalState.UnitState;
+            FullPressure = disposalState.FullPressureTime;
             var pressureReached = PressureBar.UpdatePressure(disposalState.FullPressureTime);
             Power.Pressed = disposalState.Powered;
             Engage.Pressed = disposalState.Engaged;
@@ -42,9 +46,10 @@ namespace Content.Client.Disposal.UI
             return !disposalState.Powered || pressureReached;
         }
 
-        public bool UpdatePressure(TimeSpan stateFullPressureTime)
+        protected override void FrameUpdate(FrameEventArgs args)
         {
-            return PressureBar.UpdatePressure(stateFullPressureTime);
+            base.FrameUpdate(args);
+            PressureBar.UpdatePressure(FullPressure);
         }
     }
 }
diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
index e1fbdbf089..ec73748e13 100644
--- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Disposal;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Disposal.Mailing;
 
@@ -35,7 +36,7 @@ public sealed class MailingUnitSystem : EntitySystem
         SubscribeLocalEvent<MailingUnitComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<MailingUnitComponent, BeforeDisposalFlushEvent>(OnBeforeFlush);
         SubscribeLocalEvent<MailingUnitComponent, ConfigurationSystem.ConfigurationUpdatedEvent>(OnConfigurationUpdated);
-        SubscribeLocalEvent<MailingUnitComponent, ActivateInWorldEvent>(HandleActivate);
+        SubscribeLocalEvent<MailingUnitComponent, ActivateInWorldEvent>(HandleActivate, before: new[] { typeof(DisposalUnitSystem) });
         SubscribeLocalEvent<MailingUnitComponent, DisposalUnitUIStateUpdatedEvent>(OnDisposalUnitUIStateChange);
         SubscribeLocalEvent<MailingUnitComponent, TargetSelectedMessage>(OnTargetSelected);
     }
@@ -89,13 +90,17 @@ public sealed class MailingUnitSystem : EntitySystem
         if (string.IsNullOrEmpty(component.Target))
         {
             args.Cancel();
-            return;
         }
+        else
+        {
+            args.Tags.Add(MailTag);
+            args.Tags.Add(component.Target);
 
-        args.Tags.Add(MailTag);
-        args.Tags.Add(component.Target);
+            BroadcastSentMessage(uid, component);
 
-        BroadcastSentMessage(uid, component);
+            component.Target = null;
+        }
+        UpdateUserInterface(uid, component);
     }
 
     /// <summary>
@@ -179,13 +184,15 @@ public sealed class MailingUnitSystem : EntitySystem
         if (component.DisposalUnitInterfaceState == null)
             return;
 
-        var state = new MailingUnitBoundUserInterfaceState(component.DisposalUnitInterfaceState, component.Target, component.TargetList, component.Tag);
+        var state = new MailingUnitBoundUserInterfaceState(component.DisposalUnitInterfaceState, component.Target, component.TargetList.ShallowClone(), component.Tag);
         _userInterfaceSystem.SetUiState(uid, MailingUnitUiKey.Key, state);
     }
 
     private void OnTargetSelected(EntityUid uid, MailingUnitComponent component, TargetSelectedMessage args)
     {
-        component.Target = args.Target;
+        // Clear the Target if we select the same one
+        component.Target =
+            args.Target != component.Target ? args.Target : null;
         UpdateUserInterface(uid, component);
     }