diff --git a/matrix/buffer.py b/matrix/buffer.py
index d173dcb..7cc305e 100644
--- a/matrix/buffer.py
+++ b/matrix/buffer.py
@@ -1068,6 +1068,8 @@ class RoomBuffer(object):
         # freenode bridge users better
         if (user.user_id.startswith("@_discord_") or
                 user.user_id.startswith("@_slack_") or
+                user.user_id.startswith("@_discordpuppet_") or
+                user.user_id.startswith("@_slackpuppet_") or
                 user.user_id.startswith("@whatsapp_") or
                 user.user_id.startswith("@facebook_") or
                 user.user_id.startswith("@telegram_") or