diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php
index 0d9058f2d8..a2bc5923cd 100644
--- a/app/calls/resources/classes/follow_me.php
+++ b/app/calls/resources/classes/follow_me.php
@@ -419,6 +419,7 @@ include "root.php";
 						$variables[] = "originate_delay_start=".$row["follow_me_delay"];
 						$variables[] = "sleep=".($row["follow_me_delay"] * 1000);
 						$variables[] = "leg_timeout=".$row["follow_me_timeout"];
+						$variables[] = "is_follow_me_loopback=true";
 
 						if (is_numeric($row["follow_me_destination"])) {
 							if ($_SESSION['domain']['bridge']['text'] == "outbound" || $_SESSION['domain']['bridge']['text'] == "bridge") {
diff --git a/app/dialplans/resources/switch/conf/dialplan/030_is_loopback.xml b/app/dialplans/resources/switch/conf/dialplan/030_is_loopback.xml
new file mode 100644
index 0000000000..12c8b9b062
--- /dev/null
+++ b/app/dialplans/resources/switch/conf/dialplan/030_is_loopback.xml
@@ -0,0 +1,11 @@
+<context name="${domain_name}">
+  <extension name="is_loopback" number="" app_uuid="1dcf888f-c367-46b7-b809-f2de918c266c" global="true">
+	<condition field="${is_follow_me_loopback}" expression="true">
+		<action application="set" data="from_orig_user_exists=${user_exists id ${username} ${domain_name}}" inline="true"/>
+	</condition>
+	<condition field="${from_orig_user_exists}" expression="^true$">
+		<action application="set" data="outbound_caller_id_number=${user_data ${username}@${domain} var outbound_caller_id_number}" inline="true"/>
+		<action application="set" data="outbound_caller_id_name=${user_data ${username}@${domain} var outbound_caller_id_name}" inline="true"/>
+	</condition>
+  </extension>
+</context>