diff --git a/PBot/IRCHandlers.pm b/PBot/IRCHandlers.pm
index 459e9c48..29b25b4a 100644
--- a/PBot/IRCHandlers.pm
+++ b/PBot/IRCHandlers.pm
@@ -467,6 +467,8 @@ sub normalize_hostmask {
     $host = "$1/$2/x-$user";
   }
 
+  $host =~ s{/session$}{/x-$user};
+
   return ($nick, $user, $host);
 }