diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 4cca6441d9c..0eb65829b8a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -60,7 +60,7 @@
 			to_chat(usr, "<span class='danger'>Not until the round starts!</span>", confidential = TRUE)
 			return
 
-		var/opt = null
+		var/opt = 1
 		switch(href_list["makeAntag"])
 			if(ROLE_BLOB)
 				opt = input("Set Blob Resource Gain Rate","Set Resource Rate",1) as num|null
@@ -78,6 +78,8 @@
 				opt = input("How Many", ROLE_OPERATIVE, 3) as num|null
 			if(ROLE_BROTHER)
 				opt = input("How Many", ROLE_BROTHER, 2) as num|null
+			if(ROLE_SPY)
+				opt = input("How Many", ROLE_SPY, 1) as num|null
 			if(ROLE_DRIFTING_CONTRACTOR)
 				opt = input("How Many", ROLE_DRIFTING_CONTRACTOR, 2) as num|null
 		if(src.make_antag(href_list["makeAntag"], opt))
diff --git a/modular_nova/modules/oneclickantag/code/oneclickantag.dm b/modular_nova/modules/oneclickantag/code/oneclickantag.dm
index 4bcac3ff422..1c97a5b1ae8 100644
--- a/modular_nova/modules/oneclickantag/code/oneclickantag.dm
+++ b/modular_nova/modules/oneclickantag/code/oneclickantag.dm
@@ -14,6 +14,8 @@
 	switch(antagtype)
 		if(ROLE_TRAITOR)
 			src.add_antag_datum(/datum/antagonist/traitor)
+		if(ROLE_SPY)
+			src.add_antag_datum(/datum/antagonist/spy)
 		if(ROLE_CHANGELING)
 			src.add_antag_datum(/datum/antagonist/changeling)
 		if(ROLE_REV)
@@ -64,6 +66,8 @@ If anyone can figure out how to get Obsessed to work I would be very appreciativ
 		return FALSE
 	if(!(targetrole in applicant.client.prefs.be_special))
 		return FALSE
+	if(!applicant.client.prefs.read_preference(/datum/preference/toggle/be_antag))
+		return FALSE
 	if(onstation)
 		var/turf/T = get_turf(applicant)
 		if(!is_station_level(T.z))
@@ -96,6 +100,9 @@ If anyone can figure out how to get Obsessed to work I would be very appreciativ
 		if(ROLE_CHANGELING)
 			p_p += MAKEANTAG_PL_DEFAULT_SECURITY
 			p_p += MAKEANTAG_PL_DEFAULT_HEADS
+		if(ROLE_SPY)
+			p_p += MAKEANTAG_PL_DEFAULT_SECURITY
+			p_p += MAKEANTAG_PL_DEFAULT_HEADS
 		if(ROLE_CULTIST)
 			p_p += MAKEANTAG_PL_DEFAULT_SECURITY
 			p_p += MAKEANTAG_PL_DEFAULT_HEADS