diff --git a/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml b/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml
index 4f6606cfbe..2d8154e579 100644
--- a/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml
@@ -1,11 +1,15 @@
-<context name="${domain_name}">
-  <extension name="follow me bridge" number="" app_uuid="fc07e3d5-b9d1-4480-9bae-8da911d43eac" global="true">
-    <condition field="${user_exists}" expression="true"/>
-    <condition field="${follow_me_enabled}" expression="true">
-      <action application="set" data="hangup_after_bridge=true"/>
-      <action application="set" data="continue_on_fail=true"/>
-      <action application="bridge" data="${follow_me_destinations}"/>
-      <action application="transfer" data="*99${destination_number} XML ${domain_name}"/>
-    </condition>
-  </extension>
-</context>
+<extension name="follow me bridge" continue="" uuid="3ddb9142-8e3a-4a92-8f80-a49c6a21fb04">
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${follow_me_enabled}" expression="true"/>
+	<condition field="${sofia_contact ${destination_number}@${domain_name}}" expression="error/user_not_registered" break="never"/>
+	<condition field="${forward_user_not_registered_enabled}" expression="true" break="never">
+		<action application="transfer" data="${forward_user_not_registered_destination} XML ${domain_name}"/>
+	</condition>
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${follow_me_enabled}" expression="true">
+		<action application="set" data="hangup_after_bridge=true"/>
+		<action application="set" data="continue_on_fail=true"/>
+		<action application="bridge" data="${follow_me_destinations}"/>
+		<action application="transfer" data="*99${destination_number} XML ${domain_name}"/>
+	</condition>
+</extension>