diff --git a/Application/IW4MServer.cs b/Application/IW4MServer.cs
index ef43d3cc..ec85145f 100644
--- a/Application/IW4MServer.cs
+++ b/Application/IW4MServer.cs
@@ -266,11 +266,18 @@ namespace IW4MAdmin
 
             else if (E.Type == GameEvent.EventType.Flag)
             {
+                DateTime? expires = null;
+
+                if (E.Extra is TimeSpan ts)
+                {
+                    expires = DateTime.UtcNow + ts;
+                }
+
                 // todo: maybe move this to a seperate function
                 var newPenalty = new EFPenalty()
                 {
                     Type = EFPenalty.PenaltyType.Flag,
-                    Expires = DateTime.UtcNow,
+                    Expires = expires,
                     Offender = E.Target,
                     Offense = E.Data,
                     Punisher = E.Origin,
diff --git a/Plugins/Stats/Cheat/Detection.cs b/Plugins/Stats/Cheat/Detection.cs
index 275b8a1a..b4691eb6 100644
--- a/Plugins/Stats/Cheat/Detection.cs
+++ b/Plugins/Stats/Cheat/Detection.cs
@@ -205,7 +205,7 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             var lifeTimeHits = ClientStats.HitLocations.Sum(_loc => _loc.HitCount);
             ClientStats.AverageRecoilOffset = (ClientStats.AverageRecoilOffset * (lifeTimeHits - 1) + hitRecoilAverage) / lifeTimeHits;
 
-            if (sessionAverageRecoilAmount == 0 && HitCount > Thresholds.LowSampleMinKills)
+            if (sessionAverageRecoilAmount == 0 && HitCount >= Thresholds.LowSampleMinKills)
             {
                 results.Add(new DetectionPenaltyResult()
                 {
diff --git a/Plugins/Stats/Helpers/StatManager.cs b/Plugins/Stats/Helpers/StatManager.cs
index 9f6854cf..1734e51c 100644
--- a/Plugins/Stats/Helpers/StatManager.cs
+++ b/Plugins/Stats/Helpers/StatManager.cs
@@ -650,7 +650,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                             $"{penalty.Type}-{(int)penalty.Location}-{Math.Round(penalty.Value, 2)}@{penalty.HitCount}" :
                             $"{penalty.Type}-{Math.Round(penalty.Value, 2)}@{penalty.HitCount}";
 
-                    await attacker.Flag(flagReason, penaltyClient).WaitAsync(Utilities.DefaultCommandTimeout, attacker.CurrentServer.Manager.CancellationToken);
+                    await attacker.Flag(flagReason, penaltyClient, new TimeSpan(168, 0, 0)).WaitAsync(Utilities.DefaultCommandTimeout, attacker.CurrentServer.Manager.CancellationToken);
                     break;
             }
         }
diff --git a/SharedLibraryCore/PartialEntities/EFClient.cs b/SharedLibraryCore/PartialEntities/EFClient.cs
index 8ea67af2..8f539d84 100644
--- a/SharedLibraryCore/PartialEntities/EFClient.cs
+++ b/SharedLibraryCore/PartialEntities/EFClient.cs
@@ -232,7 +232,7 @@ namespace SharedLibraryCore.Database.Models
         /// <param name="flagReason">reason for flagging</param>
         /// <param name="sender">client performing the flag</param>
         /// <returns>game event for the flag</returns>
-        public GameEvent Flag(string flagReason, EFClient sender)
+        public GameEvent Flag(string flagReason, EFClient sender, TimeSpan? flagLength = null)
         {
             var e = new GameEvent()
             {
@@ -240,6 +240,7 @@ namespace SharedLibraryCore.Database.Models
                 Origin = sender,
                 Data = flagReason,
                 Message = flagReason,
+                Extra = flagLength,
                 Target = this,
                 Owner = sender.CurrentServer
             };
@@ -667,21 +668,15 @@ namespace SharedLibraryCore.Database.Models
                 if (currentFlag != null)
                 {
                     CurrentServer.Logger.WriteDebug($"Flagging {this} because their AliasLink is flagged, but they are not");
-                    Flag(currentFlag.Offense, autoKickClient);
+                    Flag(currentFlag.Offense, autoKickClient, currentFlag.Expires - DateTime.UtcNow);
                 }
             }
             #endregion
 
             if (Level == Permission.Flagged)
             {
-                var currentAutoFlag = activePenalties
-                    .Where(p => p.Type == EFPenalty.PenaltyType.Flag && p.PunisherId == 1)
-                    .OrderByDescending(p => p.When)
-                    .FirstOrDefault();
-
                 // remove their auto flag status after a week
-                if (currentAutoFlag != null &&
-                    (DateTime.UtcNow - currentAutoFlag.When).TotalDays > 7)
+                if (!activePenalties.Any(_penalty => _penalty.Type == EFPenalty.PenaltyType.Flag))
                 {
                     CurrentServer.Logger.WriteInfo($"Unflagging {this} because the auto flag time has expired");
                     Unflag(Utilities.CurrentLocalization.LocalizationIndex["SERVER_AUTOFLAG_UNFLAG"], autoKickClient);
diff --git a/SharedLibraryCore/Services/PenaltyService.cs b/SharedLibraryCore/Services/PenaltyService.cs
index 0e57cded..67126733 100644
--- a/SharedLibraryCore/Services/PenaltyService.cs
+++ b/SharedLibraryCore/Services/PenaltyService.cs
@@ -175,11 +175,11 @@ namespace SharedLibraryCore.Services
             Expression<Func<EFPenalty, bool>> filter = (p) => (new EFPenalty.PenaltyType[]
                          {
                             EFPenalty.PenaltyType.TempBan,
-                            EFPenalty.PenaltyType.Ban
+                            EFPenalty.PenaltyType.Ban,
+                            EFPenalty.PenaltyType.Flag
                          }.Contains(p.Type) &&
                          p.Active &&
-                         (p.Expires == null || p.Expires > now)) ||
-                         (p.Type ==EFPenalty.PenaltyType.Flag && p.Active);
+                         (p.Expires == null || p.Expires > now));
 
             using (var context = new DatabaseContext(true))
             {
diff --git a/WebfrontCore/Controllers/ClientController.cs b/WebfrontCore/Controllers/ClientController.cs
index 7871bd50..63787ac7 100644
--- a/WebfrontCore/Controllers/ClientController.cs
+++ b/WebfrontCore/Controllers/ClientController.cs
@@ -22,7 +22,8 @@ namespace WebfrontCore.Controllers
                 return NotFound();
             }
 
-            var activePenalties = await Manager.GetPenaltyService().GetActivePenaltiesAsync(client.AliasLinkId, client.IPAddress);
+            var activePenalties = (await Manager.GetPenaltyService().GetActivePenaltiesAsync(client.AliasLinkId, client.IPAddress))
+                .Where(_penalty => _penalty.Type != PenaltyType.Flag);
 
             var clientDto = new PlayerInfo()
             {
@@ -46,8 +47,8 @@ namespace WebfrontCore.Controllers
                     .Distinct()
                     .OrderBy(i => i)
                     .ToList(),
-                HasActivePenalty = activePenalties.Count > 0,
-                ActivePenaltyType = activePenalties.Count > 0 ? activePenalties.First().Type.ToString() : null,
+                HasActivePenalty = activePenalties.Count() > 0,
+                ActivePenaltyType = activePenalties.Count() > 0 ? activePenalties.First().Type.ToString() : null,
                 Online = Manager.GetActiveClients().FirstOrDefault(c => c.ClientId == client.ClientId) != null,
                 TimeOnline = (DateTime.UtcNow - client.LastConnection).TimeSpanText(),
                 LinkedAccounts = client.LinkedAccounts