diff --git a/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBot.java b/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBot.java
index 8b62e6567..dda95a72d 100644
--- a/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBot.java
+++ b/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBot.java
@@ -36,9 +36,9 @@ public class SkillingBot extends AIPlayer {
 
 		switch (this.skill)
 		{
-		case Skills.MINING:
-		default:
-			break;
+			case Skills.MINING:
+			default:
+				break;
 		}
 	}
 	
diff --git a/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBotsBuilder.java b/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBotsBuilder.java
index d828aff8a..978cd7950 100644
--- a/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBotsBuilder.java
+++ b/Server/src/org/crandor/game/node/entity/player/ai/skillingbot/SkillingBotsBuilder.java
@@ -176,7 +176,8 @@ public final class SkillingBotsBuilder extends AIPlayer {
 		bot.getSkills().setLevel(Skills.FISHING, 25);
 		bot.setInteractionRange(25);
 	}
-	
+
+	//These bots are disabled because they somehow break pets
 	public static void immersiveSpawnsSkillingBots()
 	{
 		// Varrock Mine
diff --git a/Server/src/plugin/activity/pestcontrol/PCObjectHandler.java b/Server/src/plugin/activity/pestcontrol/PCObjectHandler.java
index 1b8803fff..fd349d3c9 100644
--- a/Server/src/plugin/activity/pestcontrol/PCObjectHandler.java
+++ b/Server/src/plugin/activity/pestcontrol/PCObjectHandler.java
@@ -16,6 +16,8 @@ import org.crandor.game.world.map.RegionManager;
 import org.crandor.game.world.update.flag.context.Animation;
 import org.crandor.plugin.Plugin;
 
+import java.util.ArrayList;
+
 /**
  * Handles pest control objects.
  * @author Emperor
@@ -23,6 +25,7 @@ import org.crandor.plugin.Plugin;
 public final class PCObjectHandler extends OptionHandler {
 
 	public boolean pcbotsSpawned = false;
+	public ArrayList<String> playersJoined = new ArrayList<>();
 
 	@Override
 	public Plugin<Object> newInstance(Object arg) throws Throwable {
@@ -94,12 +97,17 @@ public final class PCObjectHandler extends OptionHandler {
 			}
 			switch (object.getId()) {
 			case 14315: // Novice
-                if (!pcbotsSpawned) {
+                if (!pcbotsSpawned) { //First person to join gets bots to play with
                 	pcbotsSpawned = true;
 					for (int pestBotsAmount = 0; pestBotsAmount < 20; pestBotsAmount++) {
 						PvMBotsBuilder.createPestControlTestBot(new Location(2657, 2640));
 					}
 				}
+                if (!playersJoined.contains(player.getUsername())) { //You also get +1 bot for every friend
+					playersJoined.add(player.getUsername());
+					PvMBotsBuilder.createPestControlTestBot(new Location(2657, 2640));
+				}
+
 				startActivity(player, "pest control novice", Location.create(2661, 2639, 0));
 				return true;
 			case 25631: // Intermediate