2 files changed, 2 insertions, 8 deletions
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index e34ca7d81..22c9d9c17 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -88,13 +88,7 @@ int do_assign(User * u)
              || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
         notice_lang(s_BotServ, u, PERMISSION_DENIED);
     else {
-        if (ci->bi)
-            unassign(u, ci);
-        ci->bi = bi;
-        bi->chancount++;
-        if (ci->c && ci->c->usercount >= BSMinUsers) {
-            bot_join(ci);
-        }
+
         notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name);
         send_event(EVENT_BOT_ASSIGN, 2, ci->name, bi->nick);
     }
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index a5e0af6bb..3dcb15506 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -82,7 +82,7 @@ int do_unassign(User * u)
     else if (!ci->bi)
         notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
     else {
-        unassign(u, ci);
+        ci->bi->UnAssign(u, ci);
         notice_lang(s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name);
     }
     return MOD_CONT;