diff --git a/Distribution/Configuration/modernuo.json b/Distribution/Configuration/modernuo.json
index ef7588a1c..e2c3b1a3f 100644
--- a/Distribution/Configuration/modernuo.json
+++ b/Distribution/Configuration/modernuo.json
@@ -11,7 +11,7 @@
   "settings": {
     "accountHandler.enableAutoAccountCreation": "True",
     "accountHandler.enablePlayerPasswordCommand": "False",
-    "accountHandler.maxAccountsPerIP": "1",
+    "accountHandler.maxAccountsPerIP": "3",
     "accountSecurity.encryptionAlgorithm": "Argon2",
     "assistants.enableNegotiation": "False",
     "autoArchive.archiveLocally": "True",
@@ -97,4 +97,4 @@
     "world.savePath": "Saves",
     "world.useMultithreadedSaves": "True"
   }
-}
\ No newline at end of file
+}
diff --git a/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs b/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs
index b82040134..3a454ca4a 100644
--- a/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs
+++ b/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs
@@ -144,6 +144,8 @@ namespace Server.Engines.Harvest
 
             Type type = null;
 
+            bool stopAutoHarvest = false;
+
             if (skillBase >= resource.ReqSkill && from.CheckSkill(def.Skill, resource.MinSkill, resource.MaxSkill))
             {
                 type = GetResourceType(from, tool, def, map, loc, resource);
@@ -204,6 +206,7 @@ namespace Server.Engines.Harvest
                         {
                             SendPackFullTo(from, item, def, resource);
                             item.Delete();
+                            stopAutoHarvest = true;
                         }
 
                         var bonus = def.GetBonusResource();
@@ -236,6 +239,7 @@ namespace Server.Engines.Harvest
                             {
                                 tool.Delete();
                                 def.SendMessageTo(from, def.ToolBrokeMessage);
+                                stopAutoHarvest = true;
                             }
                         }
                     }
@@ -248,6 +252,10 @@ namespace Server.Engines.Harvest
             }
 
             OnHarvestFinished(from, tool, def, vein, bank, resource, toHarvest);
+            if (tool != null && !tool.Deleted && !stopAutoHarvest)
+            {
+                StartHarvesting(from, tool, toHarvest);
+            }
         }
 
         public virtual void OnHarvestFinished(