diff --git a/modules/wolfgame.py b/modules/wolfgame.py
index d553572..49cb772 100644
--- a/modules/wolfgame.py
+++ b/modules/wolfgame.py
@@ -2667,21 +2667,17 @@ def leave_game(cli, nick, chan, rest):
         role = var.get_reveal_role(nick)
         an = "n" if role[0] in ("a", "e", "i", "o", "u") else ""
         if var.DYNQUIT_DURING_GAME:
-            lmsg = random.choice(var.QUIT_MESSAGES).format(nick, an, role, population)
+            lmsg = random.choice(var.QUIT_MESSAGES).format(nick, an, role)
             cli.msg(botconfig.CHANNEL, lmsg)
         else:
             cli.msg(botconfig.CHANNEL, ("\02{0}\02, a \02{1}\02, has died of an unknown disease.{2}").format(nick, role, population))
         var.LOGGER.logMessage(("{0}, a {1}, has died of an unknown disease.").format(nick, role))
     else:
         # DYNQUIT_DURING_GAME should not have any effect during the join phase, so only check if we aren't in that
-        if var.PHASE != "join":
-            if var.DYNQUIT_DURING_GAME:
-                lmsg = random.choice(var.QUIT_MESSAGES_NO_REVEAL).format(nick, population)
-                cli.msg(botconfig.CHANNEL, lmsg)
-            else:
-                cli.msg(botconfig.CHANNEL, ("\02{0}\02 has died of an unknown disease.{1}").format(nick, population))
+        if var.PHASE != "join" and not var.DYNQUIT_DURING_GAME:
+            cli.msg(botconfig.CHANNEL, ("\02{0}\02 has died of an unknown disease.{1}").format(nick, population))
         else:
-            lmsg = random.choice(var.QUIT_MESSAGES_NO_REVEAL).format(nick, population)
+            lmsg = random.choice(var.QUIT_MESSAGES_NO_REVEAL).format(nick) + population
             cli.msg(botconfig.CHANNEL, lmsg)
         var.LOGGER.logMessage(("{0} has died of an unknown disease.").format(nick))
     if var.PHASE != "join":