diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index a1a7c16098..aba9404d9a 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -245,7 +245,7 @@
 /datum/quirk/prosthetic_limb/on_spawn()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/limb_slot
-	if(H.has_trait("TRAIT_PARA"))//Prevent paraplegic legs being replaced
+	if(H.has_trait(TRAIT_PARA))//Prevent paraplegic legs being replaced
 		limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)
 	else
 		limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
diff --git a/code/modules/vehicles/ridden.dm b/code/modules/vehicles/ridden.dm
index 72881e314f..8fe7322579 100644
--- a/code/modules/vehicles/ridden.dm
+++ b/code/modules/vehicles/ridden.dm
@@ -4,7 +4,7 @@
 	max_buckled_mobs = 1
 	buckle_lying = FALSE
 	default_driver_move = FALSE
-	var/legs_required = 2
+	var/legs_required = 1
 	var/arms_required = 0	//why not?
 
 /obj/vehicle/ridden/Initialize()
@@ -31,6 +31,9 @@
 
 /obj/vehicle/ridden/post_buckle_mob(mob/living/M)
 	add_occupant(M)
+	if(M.get_num_legs() < legs_required)
+		to_chat(M, "<span class='warning'>You don't have enough legs to operate the pedals!</span>")
+		unbuckle_mob(M)
 	return ..()
 
 /obj/vehicle/ridden/attackby(obj/item/I, mob/user, params)
@@ -60,11 +63,6 @@
 	if(key_type && !is_key(inserted_key))
 		to_chat(user, "<span class='warning'>[src] has no key inserted!</span>")
 		return FALSE
-	if(canmove && (user.get_num_legs() < legs_required))
-		to_chat(user, "<span class='warning'>You don't have enough legs to operate the pedals!</span>")
-		canmove = FALSE
-		addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20)
-		return FALSE
 	var/datum/component/riding/R = GetComponent(/datum/component/riding)
 	R.handle_ride(user, direction)
 	return ..()