diff --git a/setup.py b/setup.py
index 9a466f3..51c8ce8 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@
         "aiohttp",
         "python-yate>=0.4",
         "pyyaml",
-        "sqlalchemy",
+        "sqlalchemy==1.4.*",
     ],
     entry_points={
         "console_scripts": [
diff --git a/tests/test_ywsd_web.py b/tests/test_ywsd_web.py
index 62ba8eb..e60d08c 100644
--- a/tests/test_ywsd_web.py
+++ b/tests/test_ywsd_web.py
@@ -33,7 +33,7 @@ def validate_routing_tree(observed, expected):
 
     assert ("fork_ranks" in observed) == ("fork_ranks" in expected)
     if "fork_ranks" in observed:
-        for (observed_rank, expected_rank) in zip(
+        for observed_rank, expected_rank in zip(
             observed["fork_ranks"], expected["fork_ranks"]
         ):
             for key in expected_rank.keys():
@@ -41,7 +41,7 @@ def validate_routing_tree(observed, expected):
                     continue
                 assert observed_rank[key] == expected_rank[key]
         assert len(observed_rank["members"]) == len(expected_rank["members"])
-        for (observed_member, expected_member) in zip(
+        for observed_member, expected_member in zip(
             observed_rank["members"], expected_rank["members"]
         ):
             if "type" in expected_member:
@@ -261,13 +261,26 @@ async def test_webserver_delayed_forward_4748_to_2099(ywsd_engine_web):
             assert data["routing_status"] == "OK"
             main_routing_result = data["main_routing_result"]
             assert main_routing_result["type"] == "Type.FORK"
+            assert (
+                main_routing_result["target"]["parameters"]["x_originally_called"]
+                == "2099"
+            )
+            assert (
+                main_routing_result["target"]["parameters"]["osip_X-Originally-Called"]
+                == "2099"
+            )
             expected_fork_targets = [
                 {
                     "target": "lateroute/2099",
                     "parameters": {"eventphone_stage2": "1"},
                 },
                 {"target": "|drop=20"},
-                {"target": "lateroute/2042", "parameters": {"eventphone_stage2": "1"}},
+                {
+                    "target": "lateroute/2042",
+                    "parameters": {
+                        "eventphone_stage2": "1",
+                    },
+                },
             ]
             validate_fork_targets(
                 main_routing_result["fork_targets"], expected_fork_targets
@@ -297,6 +310,10 @@ async def test_webserver_immediate_forward_4748_to_2098(ywsd_engine_web):
                 main_routing_result["target"],
                 {
                     "target": "lateroute/2005",
+                    "parameters": {
+                        "x_originally_called": "2098",
+                        "osip_X-Originally-Called": "2098",
+                    },
                 },
             )
             expected_routing_tree = {
diff --git a/tests/test_ywsd_yate.py b/tests/test_ywsd_yate.py
index 3d86b81..401da9d 100644
--- a/tests/test_ywsd_yate.py
+++ b/tests/test_ywsd_yate.py
@@ -214,6 +214,8 @@ async def test_ywsd_delayed_call_fwd_4748_to_2099(ywsd_engine_ysim):
     result = await yate_sim.submit_message(msg)
     assert result.processed
     assert result.return_value == "fork"
+    assert result.params["x_originally_called"] == "2099"
+    assert result.params["osip_X-Originally-Called"] == "2099"
     assert result.params["callto.1"] == "lateroute/2099"
     assert result.params["callto.2"] == "|drop=20"
     assert result.params["callto.3"] == "lateroute/2042"
@@ -229,3 +231,5 @@ async def test_ywsd_immediate_call_fwd_4748_to_2098(ywsd_engine_ysim):
     assert result.processed
     assert result.return_value == "lateroute/2005"
     assert result.params["eventphone_stage2"] == "1"
+    assert result.params["x_originally_called"] == "2098"
+    assert result.params["osip_X-Originally-Called"] == "2098"
diff --git a/ywsd/routing_tree.py b/ywsd/routing_tree.py
index dc88152..2595f28 100644
--- a/ywsd/routing_tree.py
+++ b/ywsd/routing_tree.py
@@ -106,6 +106,9 @@ def _populate_source_and_target_parameters(self):
                 self.target.short_name, callername
             )
 
+        parameters["x_originally_called"] = self.target_extension
+        parameters["osip_X-Originally-Called"] = self.target_extension
+
         self._populate_parameters_global(parameters)
 
     @staticmethod