diff --git a/code/defines/procs/priority_announce.dm b/code/defines/procs/priority_announce.dm
index 9ac61a04173..3fa44fb82e9 100644
--- a/code/defines/procs/priority_announce.dm
+++ b/code/defines/procs/priority_announce.dm
@@ -8,7 +8,7 @@
 		announcement += "<h1 class='alert'>Priority Announcement</h1>"
 
 	else if(type == "Captain")
-		news_network.SubmitArticle(text, "Captain's Announcements", "Station Announcements", null)
+		news_network.SubmitArticle(text, "Captain's Announcement", "Station Announcements", null)
 		announcement += "<h1 class='alert'>Captain Announces</h1>"
 
 	else
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 5e71691c4a1..0bd24d7fb1b 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -555,7 +555,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 
 /obj/machinery/computer/communications/proc/make_announcement(var/mob/living/user, var/is_silicon)
 	var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?")
-	if(!input)
+	if(!input || !user.canUseTopic(src))
 		return
 	if(is_silicon)
 		priority_announce(input, null, null, "Priority")
@@ -563,8 +563,6 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 		spawn(600)//One minute cooldown
 			ai_message_cooldown = 0
 	else
-		if(!(user in view(1,src)))
-			return
 		priority_announce(input, null, 'sound/misc/announce.ogg', "Captain")
 		message_cooldown = 1
 		spawn(600)//One minute cooldown