diff --git a/Projects/UOContent/Misc/BuffIcons.cs b/Projects/UOContent/Misc/BuffIcons.cs
index f72fd3c27..46ab80109 100644
--- a/Projects/UOContent/Misc/BuffIcons.cs
+++ b/Projects/UOContent/Misc/BuffIcons.cs
@@ -1,4 +1,5 @@
 using System;
+using ModernUO.CodeGeneratedEvents;
 using Server.Mobiles;
 using Server.Network;
 
@@ -108,17 +109,15 @@ namespace Server
             Enabled = ServerConfiguration.GetOrUpdateSetting("buffIcons.enable", Core.ML);
         }
 
-        public static void ResendBuffsOnClientVersionReceived(NetState ns, ClientVersion cv)
+        [OnEvent(nameof(PlayerMobile.PlayerLoginEvent))]
+        public static void OnLogin(PlayerMobile pm)
         {
             if (!Enabled)
             {
                 return;
             }
 
-            if (ns.Mobile is PlayerMobile pm)
-            {
-                Timer.StartTimer(pm.ResendBuffs);
-            }
+            pm.ResendBuffs();
         }
 
         public static void AddBuff(Mobile m, BuffInfo b)