diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml
index ef8f27d..2777c46 100644
--- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml
@@ -45,7 +45,7 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-6671622a8a2248704ea0aadce13b812c82812e68"
+    tag: "r-1f1b04a0a7e3942c8adf5254fe2d830fa190abd0"
     dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/Recovery_getCredentials.groovy b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/Recovery_getCredentials.groovy
index f889eee..94e85a3 100644
--- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/Recovery_getCredentials.groovy
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/Recovery_getCredentials.groovy
@@ -44,6 +44,7 @@ LOG.info('Result fido2: ' + json)
       jsonFidoUAF['items'].each {
         if ("active".equals(it.stateName)) {
           response.setSessionAttribute('agov.recovery.accessapp', it.properties.fidouaf_name)
+          response.setSessionAttribute('agov.recovery.accessapp.dispatchTargetId', it.properties.identification.replaceAll('dispatch_target_', ''))
           response.setResult('loginWithFidoUAF')
           login=true
           return
diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml
index d8063bd..c69dd44 100644
--- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml
@@ -2431,6 +2431,10 @@
             <property name="dispatcher" value="link"/>
             <!-- source: pattern://4bc453bf68139ee87966b0c7 -->
             <property name="httpclient.tls.trustStoreRef" value="Recovery_mobile_nless_auth"/>
+            <!-- source: pattern://4bc453bf68139ee87966b0c7 -->
+            <property name="fidoUafUsername" value="${sess:ch.nevis.idm.User.extId}"/>
+            <!-- source: pattern://4bc453bf68139ee87966b0c7 -->
+            <property name="dispatchTargetId" value="${sess:agov.recovery.accessapp.dispatchTargetId}"/>
         </AuthState>
         <AuthState name="Auth_Realm_Recovery_Prepare_Done" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="false">
             <!-- source: pattern://6061abea33a234fad73897b7, pattern://204c22beaccdfd22727af378 -->