diff --git a/scenarios/incoming_hih/0003_test.yml.tt2 b/scenarios/incoming_hih/0003_test.yml.tt2
index 22435e9a..6beed1d4 100644
--- a/scenarios/incoming_hih/0003_test.yml.tt2
+++ b/scenarios/incoming_hih/0003_test.yml.tt2
@@ -121,6 +121,8 @@ flow:
   - start|BRANCH_ROUTE_FWD_LOOP:
   - start|ROUTE_PROCESS_INCOMING_HIH:
   - return|ROUTE_PROCESS_INCOMING_HIH:
+  - start|ROUTE_SET_HIH_CF:
+  - return|ROUTE_SET_HIH_CF:
   - start|ROUTE_APPEND_CF_HDRS:
   - start|ROUTE_ADD_EVENTMON_HEADERS:
   - return|ROUTE_ADD_EVENTMON_HEADERS:
diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2
index ddd8f9bb..d772cbc1 100644
--- a/scenarios/invite_callforward/0009_test.yml.tt2
+++ b/scenarios/invite_callforward/0009_test.yml.tt2
@@ -141,6 +141,8 @@ flow:
   - start|ROUTE_ADD_AOC_HEADER:
   - return|ROUTE_ADD_AOC_HEADER:
   - start|BRANCH_ROUTE_FWD_LOOP:
+  - start|ROUTE_SET_HIH_CF:
+  - return|ROUTE_SET_HIH_CF:
   - start|ROUTE_APPEND_CF_HDRS:
   - start|ROUTE_ADD_EVENTMON_HEADERS:
   - return|ROUTE_ADD_EVENTMON_HEADERS:
diff --git a/scenarios/invite_conference_update/0003_test.yml.tt2 b/scenarios/invite_conference_update/0003_test.yml.tt2
index 81ef63e9..1daea862 100644
--- a/scenarios/invite_conference_update/0003_test.yml.tt2
+++ b/scenarios/invite_conference_update/0003_test.yml.tt2
@@ -142,6 +142,8 @@ flow:
   - start|ROUTE_ADD_AOC_HEADER:
   - return|ROUTE_ADD_AOC_HEADER:
   - start|BRANCH_ROUTE_FWD_LOOP:
+  - start|ROUTE_SET_HIH_CF:
+  - return|ROUTE_SET_HIH_CF:
   - start|ROUTE_APPEND_CF_HDRS:
   - start|ROUTE_ADD_EVENTMON_HEADERS:
   - return|ROUTE_ADD_EVENTMON_HEADERS:
diff --git a/scenarios/invite_redirect/0009_test.yml.tt2 b/scenarios/invite_redirect/0009_test.yml.tt2
index 7ea3c60e..8bac8b77 100644
--- a/scenarios/invite_redirect/0009_test.yml.tt2
+++ b/scenarios/invite_redirect/0009_test.yml.tt2
@@ -19,6 +19,8 @@ flow:
   - start|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_STOP_RTPPROXY_BRANCH:
+  - start|ROUTE_SET_HIH_CF:
+  - return|ROUTE_SET_HIH_CF:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
   - return|ROUTE_CLEAR_CALLER_PREF:
@@ -195,5 +197,6 @@ sip_out:
       'P-NGCP-Caller-Info: <sip:testuser1002@',
       'P-NGCP-Callee-Info: <sip:testuser1004@',
       'Diversion: <sip:testuser1003@',
-      'History-Info: <sip:testuser1003@.*;cause=302>;index=1'
+      'History-Info: <sip:testuser1003@.*;user=phone\?Reason=SIP%3bcause%3d302>;index=1',
+      'History-Info: <sip:testuser1004@.*;user=phone;cause=302>;index=1.1'
     ]
diff --git a/scenarios/invite_redirect/prefs.json b/scenarios/invite_redirect/prefs.json
index 188a0af3..d77e683f 100644
--- a/scenarios/invite_redirect/prefs.json
+++ b/scenarios/invite_redirect/prefs.json
@@ -1,4 +1,8 @@
 {
+    "testuser1003@spce.test": {
+        "outbound_diversion": "uprn",
+        "outbound_history_info": "uprn"
+    },
     "testuser1004@spce.test": {
         "outbound_diversion": "uprn",
         "outbound_history_info": "uprn"
diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2
index 31636325..21752383 100644
--- a/scenarios/invite_voicebox/0003_test.yml.tt2
+++ b/scenarios/invite_voicebox/0003_test.yml.tt2
@@ -142,6 +142,8 @@ flow:
   - start|ROUTE_ADD_AOC_HEADER:
   - return|ROUTE_ADD_AOC_HEADER:
   - start|BRANCH_ROUTE_FWD_LOOP:
+  - start|ROUTE_SET_HIH_CF:
+  - return|ROUTE_SET_HIH_CF:
   - start|ROUTE_APPEND_CF_HDRS:
   - start|ROUTE_ADD_EVENTMON_HEADERS:
   - return|ROUTE_ADD_EVENTMON_HEADERS:
diff --git a/scenarios/lock_ported/0005_test.yml.tt2 b/scenarios/lock_ported/0005_test.yml.tt2
index c87dc3b1..4d446c86 100644
--- a/scenarios/lock_ported/0005_test.yml.tt2
+++ b/scenarios/lock_ported/0005_test.yml.tt2
@@ -141,6 +141,8 @@ flow:
   - start|ROUTE_ADD_AOC_HEADER:
   - return|ROUTE_ADD_AOC_HEADER:
   - start|BRANCH_ROUTE_FWD_LOOP:
+  - start|ROUTE_SET_HIH_CF:
+  - return|ROUTE_SET_HIH_CF:
   - start|ROUTE_APPEND_CF_HDRS:
   - start|ROUTE_ADD_EVENTMON_HEADERS:
   - return|ROUTE_ADD_EVENTMON_HEADERS:
diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
index 0f6ce37d..42545342 100644
--- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
@@ -112,6 +112,8 @@ flow:
   - start|ROUTE_ADD_AOC_HEADER:
   - return|ROUTE_ADD_AOC_HEADER:
   - start|BRANCH_ROUTE_FWD_LOOP:
+  - start|ROUTE_SET_HIH_CF:
+  - return|ROUTE_SET_HIH_CF:
   - start|ROUTE_APPEND_CF_HDRS:
   - start|ROUTE_ADD_EVENTMON_HEADERS:
   - return|ROUTE_ADD_EVENTMON_HEADERS: