diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 3cef251d31f..afe69e34765 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -442,6 +442,8 @@ var/global/datum/controller/occupations/job_master
 					H.Robotize()
 					return 1
 				if("AI","Clown")	//don't need bag preference stuff!
+					if(rank=="Clown") // Clowns DO need to breathe, though - N3X
+						H.species.equip(H)
 				else
 					switch(H.backbag) //BS12 EDIT
 						if(1)
@@ -458,6 +460,7 @@ var/global/datum/controller/occupations/job_master
 							var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel(H)
 							new /obj/item/weapon/storage/box/survival(BPK)
 							H.equip_to_slot_or_del(BPK, slot_back,1)
+					H.species.equip(H)
 
 		H << "<B>You are the [alt_title ? alt_title : rank].</B>"
 		H << "<b>As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>"
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 3488376c81f..31102e8775e 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -403,6 +403,8 @@
 						new_character = new /mob/living/carbon/human/grey(loc)
 					if("Machine")
 						new_character = new /mob/living/carbon/human/machine(loc)
+					if("Plasmaman")
+						new_character = new /mob/living/carbon/human/plasma(loc)
 					if("Human")
 						new_character = new /mob/living/carbon/human/human(loc)
 //				new_character.set_species(client.prefs.species)