diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 5c301057525..b5a74240a31 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -84,17 +84,17 @@
 		user.forceMove(get_turf(target))
 
 /obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob)
-	if(awaygate)
-		user.forceMove(awaygate.loc)
-	else if(user.can_admin_interact())
-		attack_hand(user)
-	else
-		to_chat(user, "[src] has no destination.")
+	if(!awaygate)
+		awaygate = locate(/obj/machinery/gateway/centeraway) in GLOB.machines
+		if(!awaygate)
+			to_chat(user, "<span class='warning'>Error: No destination found.</span>")
+			return
+	user.forceMove(awaygate.loc)
 
 /obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob)
-	if(stationgate)
-		user.forceMove(stationgate.loc)
-	else if(user.can_admin_interact())
-		attack_hand(user)
-	else
-		to_chat(user, "[src] has no destination.")
+	if(!stationgate)
+		stationgate = locate(/obj/machinery/gateway/centerstation) in GLOB.machines
+		if(!stationgate)
+			to_chat(user, "<span class='warning'>Error: No destination found.</span>")
+			return
+	user.forceMove(stationgate.loc)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index cc9f3b6dfbd..0118b0febb4 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -107,7 +107,7 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null)
 		if(!awaygate)
 			to_chat(user, "<span class='notice'>Error: No destination found.</span>")
 			return
-	if(world.time < wait && !user.can_admin_interact())
+	if(world.time < wait)
 		to_chat(user, "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>")
 		return