diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java
index 490e050..8e66cc9 100755
--- a/api/src/main/java/com/alttd/chat/config/Config.java
+++ b/api/src/main/java/com/alttd/chat/config/Config.java
@@ -203,8 +203,10 @@ public final class Config {
     }
 
     public static String PARTY_FORMAT = "<dark_aqua>(<gray><sender></gray> <hover:show_text:on <server>> → Party</hover>) <message>";
+    public static String PARTY_SPY = "<i><gray>PC:</gray><dark_gray> <dark_gray><sendername></dark_gray>: <dark_gray><partyname></dark_gray> <message></dark_gray></i>";
     private static void party() {
         PARTY_FORMAT = getString("party.format", PARTY_FORMAT);
+        PARTY_SPY = getString("party.spy", PARTY_SPY);
     }
 
     // TODO prefixes need hovers, this hasn't been setup yet!
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/ChatParty.java b/galaxy/src/main/java/com/alttd/chat/commands/ChatParty.java
index 547aa53..54d86f8 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/ChatParty.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/ChatParty.java
@@ -24,10 +24,7 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class ChatParty implements CommandExecutor, TabCompleter {
@@ -152,6 +149,11 @@ public class ChatParty implements CommandExecutor, TabCompleter {
                         }
                         party.removeUser(ChatUserManager.getChatUser(offlinePlayerIfCached.getUniqueId()));
 
+                        if (offlinePlayerIfCached.getUniqueId().equals(party.getOwnerUuid())) {
+                            sender.sendMessage(MiniMessage.get().parse("<red>You can't remove yourself, please leave instead.</red>"));
+                            return;
+                        }
+
                         if (offlinePlayerIfCached.isOnline()) {
                             Objects.requireNonNull(offlinePlayerIfCached.getPlayer())
                                     .sendMessage(MiniMessage.get().parse("<red>You were removed from the '" + party.getPartyName() + "' chat party."));
diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
index f550e38..b6cd2a5 100755
--- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
@@ -181,12 +181,21 @@ public class ChatHandler {
 
         List<Template> templates = new ArrayList<>(List.of(
                 Template.of("sender", senderName),
+                Template.of("sendername", senderName),
+                Template.of("partyname", party.getPartyName()),
                 Template.of("message", updatedMessage),
                 Template.of("server", Bukkit.getServerName()),
                 Template.of("[i]", itemComponent(player.getInventory().getItemInMainHand()))));
 
         Component component = miniMessage.parse(Config.PARTY_FORMAT, templates);
         sendPartyMessage(player, party.getPartyId(), component);
+
+        Component spyMessage = miniMessage.parse(Config.PARTY_SPY, templates);
+        for(Player pl : Bukkit.getOnlinePlayers()) {
+            if(pl.hasPermission(Config.SPYPERMISSION) && !party.getPartyUsers().containsKey(pl.getUniqueId())) { // todo add a toggle for social spy
+                pl.sendMessage(spyMessage);
+            }
+        }
     }
 
     private void sendChatChannelMessage(CustomChannel chatChannel, UUID uuid, Component component) {