diff --git a/scenarios/auth_fail/0002_test.yml.tt2 b/scenarios/auth_fail/0002_test.yml.tt2
index df18dde1..11f2c6b0 100644
--- a/scenarios/auth_fail/0002_test.yml.tt2
+++ b/scenarios/auth_fail/0002_test.yml.tt2
@@ -5,6 +5,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1003
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - exit|ROUTE_AUTH:
diff --git a/scenarios/auth_fail/0003_test.yml.tt2 b/scenarios/auth_fail/0003_test.yml.tt2
index df18dde1..11f2c6b0 100644
--- a/scenarios/auth_fail/0003_test.yml.tt2
+++ b/scenarios/auth_fail/0003_test.yml.tt2
@@ -5,6 +5,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1003
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - exit|ROUTE_AUTH:
diff --git a/scenarios/auth_fail/0004_test.yml.tt2 b/scenarios/auth_fail/0004_test.yml.tt2
index df18dde1..11f2c6b0 100644
--- a/scenarios/auth_fail/0004_test.yml.tt2
+++ b/scenarios/auth_fail/0004_test.yml.tt2
@@ -5,6 +5,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1003
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - exit|ROUTE_AUTH:
diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2
index d612d4f2..c1b70739 100644
--- a/scenarios/invite/0005_test.yml.tt2
+++ b/scenarios/invite/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
index 597271a9..afed0755 100644
--- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
index e0b6cc86..994e4a19 100644
--- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
index 86f6b8a8..4a9bd2e9 100644
--- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_allowip/0003_test.yml.tt2 b/scenarios/invite_allowip/0003_test.yml.tt2
index f4674d77..46eda14f 100644
--- a/scenarios/invite_allowip/0003_test.yml.tt2
+++ b/scenarios/invite_allowip/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_anonymous/0003_test.yml.tt2 b/scenarios/invite_anonymous/0003_test.yml.tt2
new file mode 100644
index 00000000..c2a76f2b
--- /dev/null
+++ b/scenarios/invite_anonymous/0003_test.yml.tt2
@@ -0,0 +1,43 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_INVITE:
+  - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_FIND_CALLER:
+  - start|ROUTE_AUTH:
+  - exit|ROUTE_AUTH:
+      $fU: anonymous
+      $fd: anonymous.invalid
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+sip_in:
+  - '^INVITE'
+  - 'P-Asserted-Identity: "long name here" <sip:testuser1002@spce.test>'
+  - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag='
+  - 'Contact: sip:testuser1002@'
+  - 'To: <sip:testuser1003@'
+  - 'CSeq: 1 INVITE'
+  - 'Max-Forwards: 69'
+  - 'Content-Type: application/sdp'
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 1 INVITE',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=',
+      'To: <sip:testuser1003@'
+    ]
+  - [
+      '^SIP/2.0 407 Proxy Authentication Required',
+      'CSeq: 1 INVITE',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios/invite_anonymous/0005_test.yml.tt2 b/scenarios/invite_anonymous/0005_test.yml.tt2
new file mode 100644
index 00000000..cfbe7968
--- /dev/null
+++ b/scenarios/invite_anonymous/0005_test.yml.tt2
@@ -0,0 +1,124 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_INVITE:
+  - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_FIND_CALLER:
+  - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fU: anonymous
+      $fd: anonymous.invalid
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
+  - start|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
+  - start|ROUTE_LOAD_CALLER_PREF:
+  - start|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
+  - start|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
+  - start|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
+  - start|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
+  - start|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_BLOCK_IN:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
+  - start|ROUTE_INVITE_TO_INT:
+  - start|ROUTE_OUTBOUND:
+  - start|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
+  - start|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
+  - start|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
+  - start|BRANCH_ROUTE_SBC:
+  - start|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
+  - start|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
+  - start|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
+  - start|ROUTE_SET_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
+  - start|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
+  - start|ROUTE_ADD_CALLINFO:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  - exit|ROUTE_OUTBOUND:
+sip_in:
+  - '^INVITE'
+  - 'Contact: sip:testuser1002@'
+  - 'CSeq: 2 INVITE'
+  - 'Max-Forwards: 69'
+  - 'Content-Type: application/sdp'
+  - 'Proxy-Authorization: Digest username="testuser1002"'
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 2 INVITE',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=',
+      'To: <sip:testuser1003@'
+    ]
+  - [
+      '^SIP/2.0 101 Connecting',
+      'CSeq: 2 INVITE',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=',
+      'To: <sip:testuser1003@'
+    ]
+  - [
+      '^INVITE sip:testuser1003@',
+      'CSeq: 2 INVITE',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=',
+      'To: <sip:testuser1003@',
+      'Content-Type: application/sdp',
+      'P-Caller-UUID: \w+',
+      'P-Callee-UUID: \w+',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'P-Called-Party-ID: <sip:testuser1003@',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Name: sbc'
+    ]
diff --git a/scenarios/invite_anonymous/0007_test.yml.tt2 b/scenarios/invite_anonymous/0007_test.yml.tt2
new file mode 100644
index 00000000..1c18ea97
--- /dev/null
+++ b/scenarios/invite_anonymous/0007_test.yml.tt2
@@ -0,0 +1,11 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
+    ]
diff --git a/scenarios/invite_anonymous/0008_test.yml.tt2 b/scenarios/invite_anonymous/0008_test.yml.tt2
new file mode 100644
index 00000000..11b79343
--- /dev/null
+++ b/scenarios/invite_anonymous/0008_test.yml.tt2
@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - 'start|dialog:start':
+  - 'return|dialog:start':
+  # branch ??
+  - 'return|dialog:start':
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 INVITE',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios/invite_anonymous/0009_test.yml.tt2 b/scenarios/invite_anonymous/0009_test.yml.tt2
new file mode 100644
index 00000000..12f407ef
--- /dev/null
+++ b/scenarios/invite_anonymous/0009_test.yml.tt2
@@ -0,0 +1,23 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
+sip_in:
+  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - 'CSeq: 2 ACK'
+  - '_:NOT:_P-Asserted-Identity: \w+'
+  - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      'CSeq: 2 ACK',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios/invite_anonymous/0010_test.yml.tt2 b/scenarios/invite_anonymous/0010_test.yml.tt2
new file mode 100644
index 00000000..f67ee395
--- /dev/null
+++ b/scenarios/invite_anonymous/0010_test.yml.tt2
@@ -0,0 +1,44 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - 'start|dialog:end':
+  - 'return|dialog:end':
+  - 'return|dialog:end':
+  - start|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+sip_in:
+  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - 'Contact: sip:testuser1002@'
+  - 'CSeq: 3 BYE'
+  - 'Max-Forwards: 69'
+  - 'Content-Length: 0'
+  - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>'
+  - 'To: <sip:testuser1003@'
+
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>',
+      'To: <sip:testuser1003@'
+    ]
+  - [
+      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      'Contact: sip:testuser1002@',
+      'CSeq: 3 BYE',
+      'Max-Forwards: 68',
+      'Content-Length: 0',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios/invite_anonymous/0011_test.yml.tt2 b/scenarios/invite_anonymous/0011_test.yml.tt2
new file mode 100644
index 00000000..f3039568
--- /dev/null
+++ b/scenarios/invite_anonymous/0011_test.yml.tt2
@@ -0,0 +1,18 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      '_:NOT:_P-Asserted-Identity: \w+',
+      'From: "Anonymous" <sip:anonymous@anonymous.invalid>',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios/invite_anonymous/prefs.json b/scenarios/invite_anonymous/prefs.json
new file mode 100644
index 00000000..56d962a4
--- /dev/null
+++ b/scenarios/invite_anonymous/prefs.json
@@ -0,0 +1,5 @@
+{
+    "testuser1002@spce.test": {
+        "cli": 4311002
+     }
+}
\ No newline at end of file
diff --git a/scenarios/invite_anonymous/scenario.yml b/scenarios/invite_anonymous/scenario.yml
new file mode 100644
index 00000000..8d4ed0c0
--- /dev/null
+++ b/scenarios/invite_anonymous/scenario.yml
@@ -0,0 +1,41 @@
+test_uuid: invite_anonymous
+domains:
+  'spce.test':
+    reseller_id: 1
+customers:
+  'customer.test':
+    contacts:
+      - email: "customer.test@spce.test"
+        reseller_id: 1
+    details:
+      status: 'active'
+      type: 'sipaccount'
+      billing_profile_id: 1
+      reseller_id: 1
+subscribers:
+  spce.test:
+    testuser1003:
+      customer: 'customer.test'
+      password: testuser
+      cc: 43
+      ac: 1
+      sn: 1003
+    testuser1002:
+      customer: 'customer.test'
+      password: testuser
+      cc: 43
+      ac: 1
+      sn: 1002
+      alias_numbers:
+        - cc: 34
+          ac: 96
+          sn: 5711941
+scenarios:
+  - ip: 127.126.0.1
+    username: testuser1002
+    domain: spce.test
+    responders:
+      - ip: 127.1.0.1
+        username: testuser1003
+        domain: spce.test
+        register: yes
diff --git a/scenarios/invite_anonymous/sipp_scenario00.xml b/scenarios/invite_anonymous/sipp_scenario00.xml
new file mode 100644
index 00000000..1d4df731
--- /dev/null
+++ b/scenarios/invite_anonymous/sipp_scenario00.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<scenario name="Sipwise NGCP Benchmark UAC Caller">
+  <send start_rtd="1" start_rtd="2">
+    <![CDATA[
+
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
+      From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
+      CSeq: 1 INVITE
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 8
+      a=rtpmap:8 PCMA/8000
+      a=ptime:50
+
+    ]]>
+  </send>
+
+  <recv response="100" rtd="1" optional="true">
+  </recv>
+
+  <recv response="407" rtd="2" auth="true"/>
+
+  <send>
+    <![CDATA[
+
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
+      [last_Via:]
+      P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
+      From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
+      CSeq: 1 ACK
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <pause milliseconds="500"/>
+
+  <send start_rtd="3">
+    <![CDATA[
+
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
+      From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
+      CSeq: 2 INVITE
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      [field1 file="caller.csv"]
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 8
+      a=rtpmap:8 PCMA/8000
+      a=ptime:50
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <recv response="183" optional="true">
+  </recv>
+
+  <recv response="200" rrs="true" rtd="3">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      ACK [next_url] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
+      From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
+      [routes]
+      CSeq: 2 ACK
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <pause milliseconds="500"/>
+  <nop>
+    <action>
+      <exec play_pcap_audio="scenarios/media181sec.pcap"/>
+    </action>
+  </nop>
+
+  <pause milliseconds="1000"/>
+
+  <send start_rtd="4">
+    <![CDATA[
+
+      BYE [next_url] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
+      From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
+      CSeq: 3 BYE
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      [routes]
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+
+  <recv response="200" crlf="true" rtd="4">
+  </recv>
+
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
+
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
+
+</scenario>
+
diff --git a/scenarios/invite_anonymous/sipp_scenario_responder00.xml b/scenarios/invite_anonymous/sipp_scenario_responder00.xml
new file mode 100644
index 00000000..da77f415
--- /dev/null
+++ b/scenarios/invite_anonymous/sipp_scenario_responder00.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<scenario name="Sipwise NGCP Benchmark UAS Responder">
+
+  <recv request="INVITE" crlf="true" rtd="true">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 180 Ringing
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <pause milliseconds="500"/>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Record-Route:]
+      [last_Route:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 8
+      a=rtpmap:8 PCMA/8000
+      a=ptime:50
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        crlf="true">
+  </recv>
+
+  <recv request="BYE">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: [len]
+
+    ]]>
+  </send>
+
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2
index 42e7b9b5..70e1ecbb 100644
--- a/scenarios/invite_blockin_blst/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_blst/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2
index 42e7b9b5..70e1ecbb 100644
--- a/scenarios/invite_blockin_clir/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_clir/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2
index 42e7b9b5..70e1ecbb 100644
--- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_wlst/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_blst/0003_test.yml.tt2 b/scenarios/invite_blockout_blst/0003_test.yml.tt2
index dd736f8a..fc496303 100644
--- a/scenarios/invite_blockout_blst/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_blst/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 b/scenarios/invite_blockout_ncos/0003_test.yml.tt2
index 1d249ca2..e1f56788 100644
--- a/scenarios/invite_blockout_ncos/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_ncos/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
index eb2451e2..84bdab85 100644
--- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 b/scenarios/invite_blockout_wlst/0003_test.yml.tt2
index 288a74db..622b6b65 100644
--- a/scenarios/invite_blockout_wlst/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_wlst/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2
index 20473727..5242f417 100644
--- a/scenarios/invite_callforward/0009_test.yml.tt2
+++ b/scenarios/invite_callforward/0009_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_callforward/0025_test.yml.tt2 b/scenarios/invite_callforward/0025_test.yml.tt2
index e7df478e..ac1cea9a 100644
--- a/scenarios/invite_callforward/0025_test.yml.tt2
+++ b/scenarios/invite_callforward/0025_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_concurrent_max/0007_test.yml.tt2 b/scenarios/invite_concurrent_max/0007_test.yml.tt2
index 1a22c205..a455227c 100644
--- a/scenarios/invite_concurrent_max/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_concurrent_max/0014_test.yml.tt2 b/scenarios/invite_concurrent_max/0014_test.yml.tt2
index f5d4c6ac..5bb99baf 100644
--- a/scenarios/invite_concurrent_max/0014_test.yml.tt2
+++ b/scenarios/invite_concurrent_max/0014_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1004
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1004']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
index fa8387c6..bd5eb811 100644
--- a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2
index 7a86f12f..0e8e991c 100644
--- a/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_foreign_dom/0003_test.yml.tt2 b/scenarios/invite_foreign_dom/0003_test.yml.tt2
index 6397ec03..fc770689 100644
--- a/scenarios/invite_foreign_dom/0003_test.yml.tt2
+++ b/scenarios/invite_foreign_dom/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_lateoam/0005_test.yml.tt2 b/scenarios/invite_lateoam/0005_test.yml.tt2
index 9087ee63..e4546d9a 100644
--- a/scenarios/invite_lateoam/0005_test.yml.tt2
+++ b/scenarios/invite_lateoam/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_no_refer/0005_test.yml.tt2 b/scenarios/invite_no_refer/0005_test.yml.tt2
index bf657dd9..eec41ec2 100644
--- a/scenarios/invite_no_refer/0005_test.yml.tt2
+++ b/scenarios/invite_no_refer/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2
index a63db787..05cb8383 100644
--- a/scenarios/invite_offline/0003_test.yml.tt2
+++ b/scenarios/invite_offline/0003_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2
index 6f9b01d2..5ce9dbac 100644
--- a/scenarios/invite_offline/0005_test.yml.tt2
+++ b/scenarios/invite_offline/0005_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2
index fe42a3dd..38d91141 100644
--- a/scenarios/invite_redirect/0007_test.yml.tt2
+++ b/scenarios/invite_redirect/0007_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_retrans/0005_test.yml.tt2 b/scenarios/invite_retrans/0005_test.yml.tt2
index d612d4f2..c1b70739 100644
--- a/scenarios/invite_retrans/0005_test.yml.tt2
+++ b/scenarios/invite_retrans/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2
index 5b70ca65..70020c0d 100644
--- a/scenarios/invite_speeddial/0007_test.yml.tt2
+++ b/scenarios/invite_speeddial/0007_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0016_test.yml.tt2 b/scenarios/invite_speeddial/0016_test.yml.tt2
index 7b2711b6..ccdbb57e 100644
--- a/scenarios/invite_speeddial/0016_test.yml.tt2
+++ b/scenarios/invite_speeddial/0016_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0025_test.yml.tt2 b/scenarios/invite_speeddial/0025_test.yml.tt2
index 8c054c06..8434c32c 100644
--- a/scenarios/invite_speeddial/0025_test.yml.tt2
+++ b/scenarios/invite_speeddial/0025_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0029_test.yml.tt2 b/scenarios/invite_speeddial/0029_test.yml.tt2
index be8ef6ec..da551257 100644
--- a/scenarios/invite_speeddial/0029_test.yml.tt2
+++ b/scenarios/invite_speeddial/0029_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_tcp_udp/0005_test.yml.tt2 b/scenarios/invite_tcp_udp/0005_test.yml.tt2
index 8dea6380..5196ed4c 100644
--- a/scenarios/invite_tcp_udp/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
index 3eddc456..195b6ed9 100644
--- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2
index 15a57c79..ac411b2e 100644
--- a/scenarios/invite_voicebox/0003_test.yml.tt2
+++ b/scenarios/invite_voicebox/0003_test.yml.tt2
@@ -13,6 +13,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1002
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1002']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/register/0002_test.yml.tt2 b/scenarios/register/0002_test.yml.tt2
index a2252c72..109346b6 100644
--- a/scenarios/register/0002_test.yml.tt2
+++ b/scenarios/register/0002_test.yml.tt2
@@ -9,6 +9,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1003
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/register_bria/0002_test.yml.tt2 b/scenarios/register_bria/0002_test.yml.tt2
index 1cfdb14f..57ed4937 100644
--- a/scenarios/register_bria/0002_test.yml.tt2
+++ b/scenarios/register_bria/0002_test.yml.tt2
@@ -9,6 +9,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1004
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1004']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/register_bria/0004_test.yml.tt2 b/scenarios/register_bria/0004_test.yml.tt2
index a0fd5d29..9232bd90 100644
--- a/scenarios/register_bria/0004_test.yml.tt2
+++ b/scenarios/register_bria/0004_test.yml.tt2
@@ -9,6 +9,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1003
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/register_bria/0006_test.yml.tt2 b/scenarios/register_bria/0006_test.yml.tt2
index d81d8831..fb7f65df 100644
--- a/scenarios/register_bria/0006_test.yml.tt2
+++ b/scenarios/register_bria/0006_test.yml.tt2
@@ -9,6 +9,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1003
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/register_tcp/0002_test.yml.tt2 b/scenarios/register_tcp/0002_test.yml.tt2
index fb0cd387..6885e7f7 100644
--- a/scenarios/register_tcp/0002_test.yml.tt2
+++ b/scenarios/register_tcp/0002_test.yml.tt2
@@ -10,6 +10,13 @@ flow:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1003
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
diff --git a/scenarios/reminder/0003_test.yml.tt2 b/scenarios/reminder/0003_test.yml.tt2
index 27d5df3b..8af01b99 100644
--- a/scenarios/reminder/0003_test.yml.tt2
+++ b/scenarios/reminder/0003_test.yml.tt2
@@ -12,6 +12,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
+  - start|ROUTE_AUTH_HELPER:
+      $fd: spce.test
+      $var(realm_user): testuser1001
+      $var(realm_domain): spce.test
+  - return|ROUTE_AUTH_HELPER:
+      $avp(orig_acc_caller_user): ['testuser1001']
+      $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH: