diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 70d715e3820..395c757dd7d 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -502,11 +502,11 @@
 
 	if(shuttle_master.cancelEvac(user))
 		log_game("[key_name(user)] has recalled the shuttle.")
-		message_admins("[key_name_admin(user)] has recalled the shuttle - [formatJumpTo(user)].", 1)
+		message_admins("[key_name_admin(user)] has recalled the shuttle - [ADMIN_FLW(user)].", 1)
 	else
-		to_chat(user, "The shuttle can not be recalled! Central Orders!")
+		to_chat(user, "<span class='warning'>The shuttle can not be recalled! Central Orders!</span>")
 		log_game("[key_name(user)] has tried and failed to recall the shuttle.")
-		message_admins("[key_name_admin(user)] has tried and failed to recall the shuttle - [formatJumpTo(user)].", 1)
+		message_admins("[key_name_admin(user)] has tried and failed to recall the shuttle - [ADMIN_FLW(user)].", 1)
 
 /proc/post_status(command, data1, data2, mob/user = null)
 
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 1008d7051a5..28fcfbf2778 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -762,11 +762,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm != "Yes") return
-	switch(alert(src, "Can the crew recall?", "Recallable?", "Yes", "No"))
-		if("Yes")
-			shuttle_master.emergency.canRecall = TRUE
-		else
-			shuttle_master.emergency.canRecall = FALSE
+
+	if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes")
+		shuttle_master.emergency.canRecall = TRUE
+	else
+		shuttle_master.emergency.canRecall = FALSE
 
 	shuttle_master.emergency.request()
 
@@ -786,8 +786,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
 		return
 
-	shuttle_master.emergency.canRecall = TRUE // Resets incase the admin recalls a round ender for some reason.
-	shuttle_master.emergency.cancel()
+	if(shuttle_master.emergency.canRecall == FALSE)
+		if(alert("Shuttle is currently set to be nonrecallable. Normally this happens due to round ending events. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes")
+			shuttle_master.emergency.canRecall = TRUE // Resets incase the admin recalls a round ender for some reason.
+			shuttle_master.emergency.cancel()
+		else
+			return
+	else
+		shuttle_master.emergency.cancel()
 
 	feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")