diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm
index ebcd4dcb3e1..b6f16388be7 100644
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -75,7 +75,7 @@ var/list/whitelist = list()
 	if (lowertext(species) == "human")
 		return 1
 
-	if(!alien_whitelist)
+	if (!alien_whitelist && !config.sql_whitelists)
 		return 0
 
 	if (config.sql_whitelists)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index bf1ffaf2652..eedd4b9136a 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -649,7 +649,7 @@ datum/preferences
 	if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
 		if(!(current_species.flags & CAN_JOIN))
 			restricted = 2
-		else if((current_species.flags & IS_WHITELISTED) && !is_alien_whitelisted(user,current_species))
+		else if((current_species.flags & IS_WHITELISTED) && !is_alien_whitelisted(user,current_species.name))
 			restricted = 1
 
 	if(restricted)
@@ -657,7 +657,7 @@ datum/preferences
 			dat += "<font color='red'><b>You cannot play as this species.</br><small>If you wish to be whitelisted, you can make an application post on <a href='?src=\ref[user];preference=open_whitelist_forum'>the forums</a>.</small></b></font></br>"
 		else if(restricted == 2)
 			dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race..</small></b></font></br>"
-	if(!restricted || check_rights(R_ADMIN, 0))
+	if(!restricted)
 		dat += "\[<a href='?src=\ref[user];preference=species;task=input;newspecies=[species_preview]'>select</a>\]"
 	dat += "</center></body>"