diff --git a/modules/wolfgame.py b/modules/wolfgame.py
index 5fb6f6b..ac1084f 100644
--- a/modules/wolfgame.py
+++ b/modules/wolfgame.py
@@ -1228,7 +1228,8 @@ def leave(cli, what, nick, why=""):
                "(s)he was a \02{1}\02.").format(nick, var.get_role(nick))
     cli.msg(botconfig.CHANNEL, msg)
     var.LOGGER.logMessage(msg.replace("\02", ""))
-    make_stasis(nick, var.PART_STASIS_PENALTY)
+    if var.PHASE != "join":
+        make_stasis(nick, var.PART_STASIS_PENALTY)
 
     if killhim:
         del_player(cli, nick)
@@ -1254,13 +1255,9 @@ def leave_game(cli, nick, chan, rest):
                                 "S/He was a \02{1}\02.").format(nick, var.get_role(nick)))
     var.LOGGER.logMessage(("{0} died of an unknown disease. "+
                            "S/He was a {1}.").format(nick, var.get_role(nick)))
-    try:
-        if var.get_role(nick) != "person":
-            cloak = var.USERS[str(nick)]['cloak']
-            if cloak is not None:
-                var.illegal_joins[cloak] += var.LEAVE_STASIS_PENALTY
-    except KeyError:
-        pass
+
+    if var.PHASE != "join":
+        make_stasis(nick, var.LEAVE_STASIS_PENALTY)
 
     del_player(cli, nick)