diff --git a/app/dialplan/resources/switch/conf/dialplan/530_v_click_to_call_auto_answer.xml b/app/dialplan/resources/switch/conf/dialplan/530_v_click_to_call_auto_answer.xml
new file mode 100644
index 0000000000..554ee1b70d
--- /dev/null
+++ b/app/dialplan/resources/switch/conf/dialplan/530_v_click_to_call_auto_answer.xml
@@ -0,0 +1,9 @@
+<context name="{v_context}">
+  <extension name="clear_sip_auto_answer" app_uuid="90c51470-dc31-11e3-9c1a-0800200c9a66" continue="true" >
+    <condition field="${click_to_call}" expression="true" />
+    <condition field="${sip_h_Call-Info}" expression="answer-after=0" >
+      <action application="unset" data="sip_h_Call-Info" />
+    </condition>
+  </extension>
+</context>
+