diff --git a/jarvis/__init__.py b/jarvis/__init__.py
index 567b959..0a401cb 100644
--- a/jarvis/__init__.py
+++ b/jarvis/__init__.py
@@ -103,9 +103,10 @@ async def on_message(message: Message):
         )
         if (
             massmention["value"] > 0
-            and len(message.mentions) > massmention["value"]
+            and len(message.mentions)
+            - (1 if message.author in message.mentions else 0)
+            > massmention["value"]
         ):
-            await message.delete()
             db.jarvis.warns.insert_one(
                 {
                     "user": message.author.id,
@@ -143,7 +144,13 @@ async def on_message(message: Message):
         for mention in message.mentions:
             for role in mention.roles:
                 roles.append(role.id)
-        if roleping and any(x.id in roleping["value"] for x in roles):
+        if (
+            roleping
+            and any(x in roleping["value"] for x in roles)
+            and not any(
+                x.id in roleping["value"] for x in message.author.roles
+            )
+        ):
             db.jarvis.warns.insert_one(
                 {
                     "user": message.author.id,