diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 1d6b572d9e5..a732348ac3c 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -56,7 +56,6 @@ GLOBAL_LIST_EMPTY(airlock_overlays)
 	autoclose = TRUE
 	explosion_block = 1
 	assemblytype = /obj/structure/door_assembly
-	normalspeed = 1
 	siemens_strength = 1
 	var/security_level = 0 //How much are wires secured
 	var/aiControlDisabled = AICONTROLDISABLED_OFF
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 4ed92910c5a..a86ea7d4a6b 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -20,7 +20,7 @@
 	var/locked = FALSE //whether the door is bolted or not.
 	var/glass = FALSE
 	var/welded = FALSE
-	var/normalspeed = 1
+	var/normalspeed = TRUE
 	var/auto_close_time = 150
 	var/auto_close_time_dangerous = 15
 	var/assemblytype //the type of door frame to drop during deconstruction
diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm
index 01033e6c123..185a00305de 100644
--- a/code/game/objects/items/control_wand.dm
+++ b/code/game/objects/items/control_wand.dm
@@ -1,6 +1,7 @@
 #define WAND_OPEN "Open Door"
 #define WAND_BOLT "Toggle Bolts"
 #define WAND_EMERGENCY "Toggle Emergency Access"
+#define WAND_SPEED "Change Closing Speed"
 
 /obj/item/door_remote
 	icon_state = "gangtool-white"
@@ -21,7 +22,7 @@
 	for(var/region in region_access)
 		ID.access += get_region_accesses(region)
 	ID.access += additional_access
-	ID.access = uniquelist(ID.access)	//remove duplicates
+	ID.access = uniquelist(ID.access)
 
 /obj/item/door_remote/Destroy()
 	QDEL_NULL(ID)
@@ -34,8 +35,11 @@
 		if(WAND_BOLT)
 			mode = WAND_EMERGENCY
 		if(WAND_EMERGENCY)
+			mode = WAND_SPEED
+		if(WAND_SPEED)
 			mode = WAND_OPEN
-	to_chat(user, "Now in mode: [mode].")
+
+	to_chat(user, "<span class='notice'>Now in mode: [mode].</span>")
 
 /obj/item/door_remote/afterattack(obj/machinery/door/airlock/D, mob/user)
 	if(!istype(D))
@@ -64,10 +68,13 @@
 					D.lock()
 			if(WAND_EMERGENCY)
 				if(D.emergency)
-					D.emergency = 0
+					D.emergency = FALSE
 				else
-					D.emergency = 1
+					D.emergency = TRUE
 				D.update_icon()
+			if(WAND_SPEED)
+				D.normalspeed = !D.normalspeed
+				to_chat(user, "<span class='notice'>[D] is now in [D.normalspeed ? "normal" : "fast"] mode.</span>")
 	else
 		to_chat(user, "<span class='danger'>[src] does not have access to this door.</span>")
 
@@ -144,3 +151,4 @@
 #undef WAND_OPEN
 #undef WAND_BOLT
 #undef WAND_EMERGENCY
+#undef WAND_SPEED