diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index d0e8075f996..21e60485e1a 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -335,7 +335,7 @@ var/list/occupations = list(
 
 	//I afraid I can't do that, Dave
 //	"AI" = 1,now picked like the captain
-	"Cyborg" = 1,
+	"Cyborg" = 1
 
 )
 
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index 0fdec384dc8..368fb9a7579 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -499,6 +499,8 @@ datum/preferences
 			if ((job!="AI" || config.allow_ai) && !jobban_isbanned(user, job))
 				HTML += "<a href=\"byond://?src=\ref[user];preferences=1;occ=[occ];job=[job]\">[job]</a><br>"
 
+		if(!jobban_isbanned(user, "AI"))
+			HTML += "<a href=\"byond://?src=\ref[user];preferences=1;occ=[occ];job=AI\">AI</a><br>"
 		if(!jobban_isbanned(user, "Captain"))
 			HTML += "<a href=\"byond://?src=\ref[user];preferences=1;occ=[occ];job=Captain\">Captain</a><br>"
 		HTML += "<br>"
@@ -511,7 +513,7 @@ datum/preferences
 		return
 
 	proc/SetJob(mob/user, occ=1, job="Captain")
-		if ((!( occupations.Find(job) ) && !( assistant_occupations.Find(job) ) && job != "Captain"))
+		if ((!( occupations.Find(job) ) && !( assistant_occupations.Find(job) ) && (job != "Captain" && job != "AI")))
 			return
 		if (job=="AI" && (!config.allow_ai))
 			return