diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm
index dd836aee026..987afa846bc 100644
--- a/code/game/antagonist/antagonist_helpers.dm
+++ b/code/game/antagonist/antagonist_helpers.dm
@@ -1,7 +1,7 @@
/datum/antagonist/proc/can_become_antag(var/datum/mind/player, var/ignore_role)
if (!player.current)
return 0
- if(player.current && jobban_isbanned(player.current, bantype))
+ if(jobban_isbanned(player.current, bantype) || jobban_isbanned(player.current, "Antagonist"))
return 0
if(!ignore_role)
if(player.assigned_role in restricted_jobs)
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index 45435caf4fa..7097d74968d 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -16,10 +16,6 @@ var/jobban_keylist[0] //to store the keys & ranks
//returns a reason if M is banned from rank, returns 0 otherwise
/proc/jobban_isbanned(mob/M, rank)
if(M && rank)
- /*
- if(_jobban_isbanned(M, rank)) return "Reason Unspecified" //for old jobban
- */
-
if (guest_jobbans(rank))
if(config.guest_jobban && IsGuestKey(M.key))
return "Guest Job-ban"
diff --git a/code/modules/client/preference_setup/antagonism/01_candidacy.dm b/code/modules/client/preference_setup/antagonism/01_candidacy.dm
index 6147a905b52..346b3c4ea27 100644
--- a/code/modules/client/preference_setup/antagonism/01_candidacy.dm
+++ b/code/modules/client/preference_setup/antagonism/01_candidacy.dm
@@ -35,10 +35,11 @@
/datum/category_item/player_setup_item/antagonism/candidacy/content(var/mob/user)
. += "Special Role Availability:
"
. += "
| [antag.role_text]: | "
- if(jobban_isbanned(preference_mob(), antag.bantype))
+ if(is_global_banned || jobban_isbanned(preference_mob(), antag.bantype))
. += "\[BANNED\] " else if(antag.role_type in pref.be_special_role) . += "Yes / No" |