diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_auto.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_auto.xml
new file mode 100644
index 0000000000..c83e05d7a1
--- /dev/null
+++ b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_auto.xml
@@ -0,0 +1,9 @@
+<context name="{v_context}">
+	<extension name="valet_park_auto" number="park+5900" continue="false" app_uuid="c192ee50-084d-40d8-8d9a-6959369382c8" enabled="false" order="470">
+		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(5900)$"/>
+		<condition field="${sip_h_Referred-By}" expression="sip:(.*)@.*" break="never">
+			<action application="valet_park" data="5900@${domain_name} auto in 5901 5999"/>
+			<anti-action application="valet_park" data="5900@${domain_name} auto out 5901 5999"/>
+		</condition>
+	</extension>
+</context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
deleted file mode 100644
index 128ea0074d..0000000000
--- a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<context name="{v_context}">
-	<extension name="valet_park_in" number="park+*5900" continue="false" app_uuid="c192ee50-084d-40d8-8d9a-6959369382c8" enabled="false" order="470">
-		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(5900)$">
-			<action application="valet_park" data="park@${domain_name} auto in 5901 5999"/>
-		</condition>
-	</extension>
-</context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
index b51390a82c..faf17cccb9 100644
--- a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
@@ -1,8 +1,8 @@
 <context name="{v_context}">
-	<extension name="valet_park_out" number="park+*5901-*5999" continue="false" app_uuid="242130d4-61d6-4daf-9dd1-b139a2b3b166" enabled="false" order="475">
+	<extension name="valet_park_out" number="park+5901-5999" continue="false" app_uuid="242130d4-61d6-4daf-9dd1-b139a2b3b166" enabled="false" order="475">
 		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(59[0-9][0-9])$">
 			<action application="answer"/>
-			<action application="valet_park" data="park@${domain_name} $1"/>
+			<action application="valet_park" data="5900@${domain_name} $1"/>
 		</condition>
 	</extension>
 </context>