diff --git a/modules/wolfgame.py b/modules/wolfgame.py
index 649dd97..a398264 100644
--- a/modules/wolfgame.py
+++ b/modules/wolfgame.py
@@ -5173,13 +5173,22 @@ def transition_night(cli):
         pl = ps[:]
         random.shuffle(pl)
         pl.remove(ass)
-        if ass in var.PLAYERS and not is_user_simple(ass):
-            pm(cli, ass, ('You are an \u0002assassin\u0002. Choose a target with ' +
-                          '"target <nick>". If you die you will take out your target with you. ' +
-                          'If your target dies you may choose another one.'))
+        role = var.get_role(ass)
+        if role == "village drunk":
+            var.TARGETED[ass] = random.choice(pl)
+            message = ("You are an \u0002assassin\u0002. In your drunken stupor you have selected " +
+                       "\u0002{0}\u0002 as your target.").format(var.TARGETED[ass])
+            if ass in var.PLAYERS and not is_user_simple(ass):
+                message += " If you die you will take out your target with you."
+            pm(cli, ass, message)
         else:
-            pm(cli, ass, "You are an \u0002assassin\u0002.")
-        pm(cli, ass, "Players: " + ", ".join(pl))
+            if ass in var.PLAYERS and not is_user_simple(ass):
+                pm(cli, ass, ('You are an \u0002assassin\u0002. Choose a target with ' +
+                              '"target <nick>". If you die you will take out your target with you. ' +
+                              'If your target dies you may choose another one.'))
+            else:
+                pm(cli, ass, "You are an \u0002assassin\u0002.")
+            pm(cli, ass, "Players: " + ", ".join(pl))
 
     if var.FIRST_NIGHT:
         for mm in var.ROLES["matchmaker"]:
diff --git a/settings/wolfgame.py b/settings/wolfgame.py
index 5ecb896..a1b9c11 100644
--- a/settings/wolfgame.py
+++ b/settings/wolfgame.py
@@ -199,7 +199,7 @@ TEMPLATE_RESTRICTIONS = {"cursed villager" : WOLF_ROLES + ["seer", "oracle", "au
                          "gunner"          : WOLFTEAM_ROLES + ["fool", "lycan", "jester"],
                          "sharpshooter"    : WOLFTEAM_ROLES + ["fool", "lycan", "jester"],
                          "mayor"           : ["fool", "jester", "monster"],
-                         "assassin"        : WOLF_ROLES + list(TOTEM_ORDER) + ["traitor", "seer", "augur", "oracle", "harlot", "detective", "bodyguard", "guardian angel", "village drunk", "hunter", "fool", "mayor", "lycan", "doctor"],
+                         "assassin"        : WOLF_ROLES + ["traitor", "seer", "augur", "oracle", "harlot", "detective", "bodyguard", "guardian angel", "lycan"],
                          "bureaucrat"      : [],
                          }