diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 66c56dd196a..c86350d11f0 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -171,7 +171,7 @@ var/shuttle_call/shuttle_calls[0]
 
 		if("callshuttle")
 			var/input = stripped_input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
-			if(!input || ..() || !(is_authenticated(usr) == 2))
+			if(!input || ..() || !is_authenticated(usr))
 				nanomanager.update_uis(src)
 				return
 				
@@ -426,7 +426,7 @@ var/shuttle_call/shuttle_calls[0]
 		return
 
 	if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE
-		user << "<span class='warning'>The emergency shuttle is refueling. Please wait another [round((6000-world.time)/60)] minutes before trying again.</span>"
+		user << "<span class='warning'>The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minutes before trying again.</span>"
 		return
 
 	if(emergency_shuttle.going_to_centcom())
@@ -470,7 +470,7 @@ var/shuttle_call/shuttle_calls[0]
 			return
 
 		if(world.time < 54000) // 30 minute grace period to let the game get going
-			user << "The shuttle is refueling. Please wait another [round((54000-world.time)/60)] minutes before trying again."
+			user << "The shuttle is refueling. Please wait another [round((54000-world.time)/600)] minutes before trying again."
 			return
 
 		if(ticker.mode.name == "epidemic")