diff --git a/app/dialplan/resources/switch/conf/dialplan/010_user_exists.xml b/app/dialplan/resources/switch/conf/dialplan/010_user_exists.xml
index 05c3f91347..8353c4aafb 100644
--- a/app/dialplan/resources/switch/conf/dialplan/010_user_exists.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/010_user_exists.xml
@@ -16,7 +16,7 @@
 			<action application="set" data="call_timeout=${user_data ${destination_number}@${domain_name} var call_timeout}"/>
 			<action application="set" data="missed_call_app=${user_data ${destination_number}@${domain_name} var missed_call_app}"/>
 			<action application="set" data="missed_call_data=${user_data ${destination_number}@${domain_name} var missed_call_data}"/>
-			<action application="set" data="call_screen_enabled=${user_data ${destination_number}@${domain_name} var call_screen_enabled}"/>
+			<action application="set" data="call_screen_enabled=${user_data ${destination_number}@${domain_name} var call_screen_enabled}" inline="true"/>
 		</condition>
 	</extension>
 </context>
\ No newline at end of file
diff --git a/app/dialplan/resources/switch/conf/dialplan/990_call_screen.xml b/app/dialplan/resources/switch/conf/dialplan/990_call_screen.xml
index 1c10c3e31c..ed58380d8d 100644
--- a/app/dialplan/resources/switch/conf/dialplan/990_call_screen.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/990_call_screen.xml
@@ -1,7 +1,7 @@
 <context name="{v_context}">
 	<extension name="call_screen" number="[ext]" continue="true" app_uuid="b26a08a5-a062-42ca-b90f-d47f905dd876">
-		<condition field="${call_screen_enabled}" expression="^true$" break="never"/>
-		<condition field="destination_number" expression="^(\d{2,7})$">
+		<condition field="${call_screen_enabled}" expression="^true$"/>
+		<condition field="${call_direction}" expression="^inbound$">
 			<action application="set" data="call_screen_file=/tmp/${caller_id_number}-name.wav"/>
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>