diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm
index 0d610cae474f81a39f66c306f150646c417beb45..5ae1cd7f10fef475eae60b46d27eaf301888fc7d 100644
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm
@@ -3,6 +3,7 @@ package Lemonldap::NG::Common::Session::REST;
 use strict;
 use Mouse;
 use Lemonldap::NG::Common::Conf::Constants;
+use Lemonldap::NG::Common::Util qw/display2F/;
 use JSON qw(from_json to_json);
 
 our $VERSION = '2.0.15';
@@ -46,7 +47,7 @@ sub hAttr {
 sub delSession {
     my ( $self, $req ) = @_;
     my $type = $req->params('sessionType');
-    my $mod = $self->getMod($req)
+    my $mod  = $self->getMod($req)
       or return $self->sendError( $req, undef, 400 );
     my $id = $req->params('sessionId')
       or return $self->sendError( $req, 'sessionId is missing', 400 );
@@ -181,9 +182,16 @@ sub delete2F {
         $self->logger->debug(
             "Searching for 2F device to delete -> $type / $epoch ...");
         if ( defined $element->{type} && defined $element->{epoch} ) {
-            push @keep, $element
-              unless ( ( $element->{type} eq $type )
-                and ( $element->{epoch} eq $epoch ) );
+            if (    ( $element->{type} eq $type )
+                and ( $element->{epoch} eq $epoch ) )
+            {
+                my $uid = $session->data->{_session_uid};
+                $self->userLogger->notice(
+                    "2FA deletion for $uid: " . display2F($element) );
+            }
+            else {
+                push @keep, $element;
+            }
         }
         else {
             $self->logger->error("Corrupted _2fDevice");
diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm
index 569bea4a88736b0cabf502777b88a6e1336de4e2..56560684c2eafdd93e607a1ffa0ef8fe481f95f7 100644
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm
@@ -7,7 +7,7 @@ use MIME::Base64 qw(encode_base64);
 
 our $VERSION   = '2.0.14';
 our @ISA       = qw(Exporter);
-our @EXPORT_OK = qw(getSameSite getPSessionID genId2F);
+our @EXPORT_OK = qw(getSameSite getPSessionID genId2F display2F);
 
 sub getPSessionID {
     my ($uid) = @_;
@@ -20,6 +20,11 @@ sub genId2F {
         "" );
 }
 
+sub display2F {
+    my ($device) = @_;
+    return sprintf( "[%s]%s", $device->{type}, $device->{epoch} );
+}
+
 sub getSameSite {
     my ($conf) = @_;
 
diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/2F.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/2F.pm
index 918339607dfdf3c818360f86fc4088a759a3c3e7..04d5ca06878cb0659851a0669fb40553a2ffe6a4 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/2F.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/2F.pm
@@ -10,7 +10,7 @@ use Mouse;
 use JSON;
 
 use Lemonldap::NG::Common::Session;
-use Lemonldap::NG::Common::Util qw/genId2F/;
+use Lemonldap::NG::Common::Util qw/genId2F display2F/;
 
 sub getSecondFactors {
     my ( $self, $req ) = @_;
@@ -230,7 +230,7 @@ sub _delete2FFromSessions {
                     push @keep, $element;
                 }
                 else {
-                    $removed->{ genId2F($element) } = "removed";
+                    $removed->{ genId2F($element) } = $element;
                 }
             }
             if ( ( $total - scalar @keep ) > 0 ) {
@@ -291,6 +291,13 @@ sub _delete2F {
     # merge results
     $removed = { %$removed, %{ $res->{removed} } };
     $count   = scalar( keys %$removed );
+    if ($count) {
+        my $list_log = join(
+            ",", map { display2F( $removed->{$_} ) }
+              keys %$removed
+        );
+        $self->userLogger->notice("[API] 2FA deletion for $uid: $list_log");
+    }
 
     return {
         res     => 'ok',
diff --git a/lemonldap-ng-manager/site/coffee/2ndfa.coffee b/lemonldap-ng-manager/site/coffee/2ndfa.coffee
index 9e2198d3dcf2182d86191425069a04a42478f81f..9d8e29d7ae00b3b277c3fb6f203de2a580c9992d 100644
--- a/lemonldap-ng-manager/site/coffee/2ndfa.coffee
+++ b/lemonldap-ng-manager/site/coffee/2ndfa.coffee
@@ -203,7 +203,7 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
 							array = JSON.parse(session[attr])
 							if array.length > 0
 								subres.push
-									title: "type"
+									title: "2fid"
 									value: "name"
 									epoch: "date"
 								for sfDevice in array
@@ -215,7 +215,7 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
 										if key == 'epoch'
 											epoch = value
 									subres.push
-										title: title
+										title: '[' + title + ']' + epoch
 										value: name
 										epoch: epoch
 										sfrow: true
diff --git a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js
index b023164be33e8ac020fa6730e1f2f8acf19b3d98..741ca0afa32e63f27cc383d3fb93e20cd70f3d0c 100644
--- a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js
+++ b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js
@@ -207,7 +207,7 @@
                   array = JSON.parse(session[attr]);
                   if (array.length > 0) {
                     subres.push({
-                      title: "type",
+                      title: "2fid",
                       value: "name",
                       epoch: "date"
                     });
@@ -226,7 +226,7 @@
                         }
                       }
                       subres.push({
-                        title: title,
+                        title: '[' + title + ']' + epoch,
                         value: name,
                         epoch: epoch,
                         sfrow: true
diff --git a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js
index 857e6fcca2a8027191db01de77f4ea57cd6c9533..d031ff9ab6fc9d44eb5d303a0226a9920a3cc128 100644
--- a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js
+++ b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js
@@ -1 +1 @@
-!function(){var a={_whatToTrace:[function(e,t){return"groupBy=substr("+e+",1)"},function(e,t){return e+"="+t+"*"}]},d={_whatToTrace:function(e,t,n,r){return console.log("overSchema => level",n,"over",r),1===n&&t.length>r?e+"="+t+"*&groupBy=substr("+e+","+(n+r+1)+")":null}},_={dateTitle:["_utime","_startTime","_updateTime"],sfaTitle:["_2fDevices"]},i={home:[]};angular.module("llngSessionsExplorer",["ui.tree","ui.bootstrap","llApp"]).controller("SessionsExplorerCtrl",["$scope","$translator","$location","$q","$http",function(v,t,e,n,p){var f,r,h;return v.links=links,v.menulinks=menulinks,v.staticPrefix=staticPrefix,v.scriptname=scriptname,v.formPrefix=formPrefix,v.availableLanguages=availableLanguages,v.waiting=!0,v.showM=!1,v.showT=!0,v.data=[],v.currentScope=null,v.currentSession=null,v.menu=i,v.searchString="",v.sfatypes={},v.translateP=t.translateP,v.translate=t.translate,v.translateTitle=function(e){return t.translateField(e,"title")},h="persistent",v.menuClick=function(e){if(e.popup)window.open(e.popup);else switch(e.action||(e.action=e.title),typeof e.action){case"function":e.action(v.currentNode,v),v[e.action]();break;case"string":v[e.action]();break;default:console.log(typeof e.action)}return v.showM=!1},v.search2FA=function(e){return e&&(v.searchString=""),v.currentSession=null,v.data=[],v.updateTree2("",v.data,0,0)},v.delete2FA=function(e,t){for(var n=document.querySelectorAll(".data-"+t),r=0,a=n.length;r<a;r++)n[r].remove();return v.waiting=!0,p.delete(scriptname+"sfa/"+h+"/"+v.currentSession.id+"?type="+e+"&epoch="+t).then(function(e){return v.waiting=!1},function(e){return v.waiting=!1}),v.showT=!1},v.stoggle=function(e){var t=e.$modelValue;return 0===t.nodes.length&&v.updateTree(t.value,t.nodes,t.level,t.over,t.query,t.count),e.toggle()},v.displaySession=function(e){var t,n=function(e){var t,n,r,a,i,o,u,s,l,c,p,f,h,d,g,m,w,y=e._utime;for(s in e)(w=e[s])?("string"==typeof e&&w.match(/; /)&&(e[s]=w.split("; ")),"object"!=typeof e[s]&&("_password".match(new RegExp("\b"+s+"\b"))?e[s]="********":s.match(/^(_utime|_lastAuthnUTime|_lastSeen|notification)$/)?e[s]=v.localeDate(w):s.match(/^(_startTime|_updateTime)$/)&&(f=/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/,f=w.match(f),e[s]=f[3]+"/"+f[2]+"/"+f[1]+" à "+f[4]+":"+f[5]+":"+f[6]))):delete e[s];for(a in h=[],_){for(g=[],o=0,l=(r=_[a]).length;o<l;o++)if(n=r[o],e[n])if("_2fDevices"===n&&e[n]){if(0<(t=JSON.parse(e[n])).length)for(g.push({title:"type",value:"name",epoch:"date"}),u=0,c=t.length;u<c;u++){for(s in d=t[u])w=d[s],"type"===s&&(m=w),"name"===s&&(p=w),"epoch"===s&&(i=w);g.push({title:m,value:p,epoch:i,sfrow:!0})}delete e[n]}else e[n].toString().match(/\w+/)&&g.push({title:n,value:e[n]}),delete e[n];else delete e[n];0<g.length&&h.push({title:"__"+a+"__",nodes:g})}return{_utime:y,nodes:h}};return v.currentScope=e,t=e.$modelValue.session,p.get(scriptname+"sfa/"+h+"/"+t).then(function(e){return v.currentSession=n(e.data),v.currentSession.id=t}),v.showT=!1},v.localeDate=function(e){return new Date(1e3*e).toLocaleString()},v.getLanguage=function(e){return v.lang=e,v.form="white",v.init(),v.showM=!1},r=function(e,t,n){t=t.match(/#!?\/(\w+)/);return null!==t&&!t[1].match(/^(persistent)$/)||(v.type="_session_uid"),v.init()},v.$on("$locationChangeSuccess",r),f=0,v.updateTree=function(i,o,u,s,e,t){var l,c,n;return v.waiting=!0,c=a[v.type]||a._whatToTrace,l=c[u](v.type,i,e),25<t&&d[v.type]&&(n=d[v.type](v.type,i,u,s,e))?(s++,l=n,u-=1):s=0,p.get(scriptname+"sfa/"+h+"?"+l+Object.entries(v.sfatypes).map(function(e){return e[1]?"&type="+e[0]:""}).join("")).then(function(e){var t,n,r,a,e=e.data;if(e.result){for(t=0,n=(a=e.values).length;t<n;t++)r=a[t],f++,r.id="node"+f,u<c.length-1&&(r.nodes=[],r.level=u+1,r.query=l,r.over=s),o.push(r);""===i&&(v.total=e.total)}return v.waiting=!1},function(e){return v.waiting=!1})},v.updateTree2=function(i,o,u,s,e,t){var l,c,n;return v.waiting=!0,c=a[v.type]||("_updateTime"===v.type?a._startTime:a._whatToTrace),l=c[u](v.type,i,e),25<t&&d[v.type]&&(n=d[v.type](v.type,i,u,s,e))?(s++,l=n,u-=1):s=0,p.get(scriptname+"sfa/"+h+"?_session_uid="+v.searchString+"*&groupBy=substr(_session_uid,"+v.searchString.length+")"+Object.entries(v.sfatypes).map(function(e){return e[1]?"&type="+e[0]:""}).join("")).then(function(e){var t,n,r,a,e=e.data;if(e.result){for(t=0,n=(a=e.values).length;t<n;t++)r=a[t],f++,r.id="node"+f,u<c.length-1&&(r.nodes=[],r.level=u+1,r.query=l,r.over=s),o.push(r);""===i&&(v.total=e.total)}return v.waiting=!1},function(e){return v.waiting=!1})},v.init=function(){return v.waiting=!0,v.data=[],n.all([t.init(v.lang),v.updateTree("",v.data,0,0)]).then(function(){return v.waiting=!1},function(e){return v.waiting=!1}),v.activeModule="2ndFA",v.myStyle={color:"#ffb84d"}},e=e.path().match(/^\/(\w+)/),v.type=e?e[1]:"_whatToTrace"}])}.call(this);
\ No newline at end of file
+!function(){var a={_whatToTrace:[function(e,t){return"groupBy=substr("+e+",1)"},function(e,t){return e+"="+t+"*"}]},d={_whatToTrace:function(e,t,n,r){return console.log("overSchema => level",n,"over",r),1===n&&t.length>r?e+"="+t+"*&groupBy=substr("+e+","+(n+r+1)+")":null}},_={dateTitle:["_utime","_startTime","_updateTime"],sfaTitle:["_2fDevices"]},i={home:[]};angular.module("llngSessionsExplorer",["ui.tree","ui.bootstrap","llApp"]).controller("SessionsExplorerCtrl",["$scope","$translator","$location","$q","$http",function(v,t,e,n,p){var f,r,h;return v.links=links,v.menulinks=menulinks,v.staticPrefix=staticPrefix,v.scriptname=scriptname,v.formPrefix=formPrefix,v.availableLanguages=availableLanguages,v.waiting=!0,v.showM=!1,v.showT=!0,v.data=[],v.currentScope=null,v.currentSession=null,v.menu=i,v.searchString="",v.sfatypes={},v.translateP=t.translateP,v.translate=t.translate,v.translateTitle=function(e){return t.translateField(e,"title")},h="persistent",v.menuClick=function(e){if(e.popup)window.open(e.popup);else switch(e.action||(e.action=e.title),typeof e.action){case"function":e.action(v.currentNode,v),v[e.action]();break;case"string":v[e.action]();break;default:console.log(typeof e.action)}return v.showM=!1},v.search2FA=function(e){return e&&(v.searchString=""),v.currentSession=null,v.data=[],v.updateTree2("",v.data,0,0)},v.delete2FA=function(e,t){for(var n=document.querySelectorAll(".data-"+t),r=0,a=n.length;r<a;r++)n[r].remove();return v.waiting=!0,p.delete(scriptname+"sfa/"+h+"/"+v.currentSession.id+"?type="+e+"&epoch="+t).then(function(e){return v.waiting=!1},function(e){return v.waiting=!1}),v.showT=!1},v.stoggle=function(e){var t=e.$modelValue;return 0===t.nodes.length&&v.updateTree(t.value,t.nodes,t.level,t.over,t.query,t.count),e.toggle()},v.displaySession=function(e){var t,n=function(e){var t,n,r,a,i,o,u,s,l,c,p,f,h,d,g,m,w,y=e._utime;for(s in e)(w=e[s])?("string"==typeof e&&w.match(/; /)&&(e[s]=w.split("; ")),"object"!=typeof e[s]&&("_password".match(new RegExp("\b"+s+"\b"))?e[s]="********":s.match(/^(_utime|_lastAuthnUTime|_lastSeen|notification)$/)?e[s]=v.localeDate(w):s.match(/^(_startTime|_updateTime)$/)&&(f=/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/,f=w.match(f),e[s]=f[3]+"/"+f[2]+"/"+f[1]+" à "+f[4]+":"+f[5]+":"+f[6]))):delete e[s];for(a in h=[],_){for(g=[],o=0,l=(r=_[a]).length;o<l;o++)if(n=r[o],e[n])if("_2fDevices"===n&&e[n]){if(0<(t=JSON.parse(e[n])).length)for(g.push({title:"2fid",value:"name",epoch:"date"}),u=0,c=t.length;u<c;u++){for(s in d=t[u])w=d[s],"type"===s&&(m=w),"name"===s&&(p=w),"epoch"===s&&(i=w);g.push({title:"["+m+"]"+i,value:p,epoch:i,sfrow:!0})}delete e[n]}else e[n].toString().match(/\w+/)&&g.push({title:n,value:e[n]}),delete e[n];else delete e[n];0<g.length&&h.push({title:"__"+a+"__",nodes:g})}return{_utime:y,nodes:h}};return v.currentScope=e,t=e.$modelValue.session,p.get(scriptname+"sfa/"+h+"/"+t).then(function(e){return v.currentSession=n(e.data),v.currentSession.id=t}),v.showT=!1},v.localeDate=function(e){return new Date(1e3*e).toLocaleString()},v.getLanguage=function(e){return v.lang=e,v.form="white",v.init(),v.showM=!1},r=function(e,t,n){t=t.match(/#!?\/(\w+)/);return null!==t&&!t[1].match(/^(persistent)$/)||(v.type="_session_uid"),v.init()},v.$on("$locationChangeSuccess",r),f=0,v.updateTree=function(i,o,u,s,e,t){var l,c,n;return v.waiting=!0,c=a[v.type]||a._whatToTrace,l=c[u](v.type,i,e),25<t&&d[v.type]&&(n=d[v.type](v.type,i,u,s,e))?(s++,l=n,u-=1):s=0,p.get(scriptname+"sfa/"+h+"?"+l+Object.entries(v.sfatypes).map(function(e){return e[1]?"&type="+e[0]:""}).join("")).then(function(e){var t,n,r,a,e=e.data;if(e.result){for(t=0,n=(a=e.values).length;t<n;t++)r=a[t],f++,r.id="node"+f,u<c.length-1&&(r.nodes=[],r.level=u+1,r.query=l,r.over=s),o.push(r);""===i&&(v.total=e.total)}return v.waiting=!1},function(e){return v.waiting=!1})},v.updateTree2=function(i,o,u,s,e,t){var l,c,n;return v.waiting=!0,c=a[v.type]||("_updateTime"===v.type?a._startTime:a._whatToTrace),l=c[u](v.type,i,e),25<t&&d[v.type]&&(n=d[v.type](v.type,i,u,s,e))?(s++,l=n,u-=1):s=0,p.get(scriptname+"sfa/"+h+"?_session_uid="+v.searchString+"*&groupBy=substr(_session_uid,"+v.searchString.length+")"+Object.entries(v.sfatypes).map(function(e){return e[1]?"&type="+e[0]:""}).join("")).then(function(e){var t,n,r,a,e=e.data;if(e.result){for(t=0,n=(a=e.values).length;t<n;t++)r=a[t],f++,r.id="node"+f,u<c.length-1&&(r.nodes=[],r.level=u+1,r.query=l,r.over=s),o.push(r);""===i&&(v.total=e.total)}return v.waiting=!1},function(e){return v.waiting=!1})},v.init=function(){return v.waiting=!0,v.data=[],n.all([t.init(v.lang),v.updateTree("",v.data,0,0)]).then(function(){return v.waiting=!1},function(e){return v.waiting=!1}),v.activeModule="2ndFA",v.myStyle={color:"#ffb84d"}},e=e.path().match(/^\/(\w+)/),v.type=e?e[1]:"_whatToTrace"}])}.call(this);
\ No newline at end of file
diff --git a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js.map b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js.map
index d70a5c1414593edd6d1403e2cec29df2d833a9ed..4191f731be69e8c3b467dec47470525d868aa276 100644
--- a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js.map
+++ b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["2ndfa.js"],"names":["schemes","_whatToTrace","t","v","overScheme","level","over","console","log","length","categories","dateTitle","sfaTitle","menu","home","angular","module","controller","$scope","$translator","$location","$q","$http","autoId","pathEvent","sessionType","links","menulinks","staticPrefix","scriptname","formPrefix","availableLanguages","waiting","showM","showT","data","currentScope","currentSession","searchString","sfatypes","translateP","translate","translateTitle","node","translateField","menuClick","button","popup","window","open","action","title","currentNode","search2FA","clear","updateTree2","delete2FA","type","epoch","items","document","querySelectorAll","i","len","remove","id","then","response","resp","stoggle","scope","$modelValue","nodes","updateTree","value","query","count","toggle","displaySession","sessionId","transformSession","session","array","attr","attrs","category","k","key","len1","name","pattern","res","sfDevice","subres","time","_utime","match","split","RegExp","localeDate","arrayDate","JSON","parse","push","sfrow","toString","get","s","Date","toLocaleString","getLanguage","lang","form","init","event","next","current","n","$on","currentQuery","scheme","tmp","Object","entries","map","x","join","ref","result","values","total","_startTime","all","activeModule","myStyle","color","c","path","call","this"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"sources":["2ndfa.js"],"names":["schemes","_whatToTrace","t","v","overScheme","level","over","console","log","length","categories","dateTitle","sfaTitle","menu","home","angular","module","controller","$scope","$translator","$location","$q","$http","autoId","pathEvent","sessionType","links","menulinks","staticPrefix","scriptname","formPrefix","availableLanguages","waiting","showM","showT","data","currentScope","currentSession","searchString","sfatypes","translateP","translate","translateTitle","node","translateField","menuClick","button","popup","window","open","action","title","currentNode","search2FA","clear","updateTree2","delete2FA","type","epoch","items","document","querySelectorAll","i","len","remove","id","then","response","resp","stoggle","scope","$modelValue","nodes","updateTree","value","query","count","toggle","displaySession","sessionId","transformSession","session","array","attr","attrs","category","k","key","len1","name","pattern","res","sfDevice","subres","time","_utime","match","split","RegExp","localeDate","arrayDate","JSON","parse","push","sfrow","toString","get","s","Date","toLocaleString","getLanguage","lang","form","init","event","next","current","n","$on","currentQuery","scheme","tmp","Object","entries","map","x","join","ref","result","values","total","_startTime","all","activeModule","myStyle","color","c","path","call","this"],"mappings":"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"}
\ No newline at end of file
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
index 63b47e14c7713722cf10251ec79a1d0321919ea0..dd4ec76a64829dcc4f5bc04e0c288c0e4d303775 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"2ndFA sessions explorer",
+"2fid":"المعرف",
 "2ndFA":"Second Factors",
 "ADPwdExpireWarning":"تحذير انتهاء صلاحية كلمة المرور",
 "ADPwdMaxAge":"الحد الأقصى لصلحية كلمة المرور",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"خدمة أل يو أر ل",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"لا يحتوي الخادم على إعدادات. استخدام قالب لحفظ الأول"
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
index 3f59e480cea46942a7cf5969dfc83c2daf77d85e..e3ec1d5109e5ca64b5e9fb6171cfb446debd9b7e 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"2ndFA sessions explorer",
+"2fid":"Identifier",
 "2ndFA":"Second Factors",
 "ADPwdExpireWarning":"Password expire warning",
 "ADPwdMaxAge":"Password max age",
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/es.json b/lemonldap-ng-manager/site/htdocs/static/languages/es.json
index e5456b20c70613918bbdc266e750e286806f3136..a651bc8489dbb45efa24eceee9404053d8ae6835 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"Explorador de sesiones 2snFA",
+"2fid":"Identificador",
 "2ndFA":"Segundos Factores",
 "ADPwdExpireWarning":"Alerta de caducidad de la contraseña",
 "ADPwdMaxAge":"Límite temporal de la contraseña",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"URL de servicio",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"Server has no configuration. Use template to save the first."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
index 79dca84f7d5d1a8441e9092d1fbd15ca8a81d093..b58faf473b04f312d0404dbcf3e75d463fef4075 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"Explorateur sessions 2ndFA",
+"2fid":"Identifiant",
 "2ndFA":"Seconds Facteurs",
 "ADPwdExpireWarning":"Avertissement avant expiration du mot de passe",
 "ADPwdMaxAge":"Age maximal du mot de passe",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"URL du service",
 "yubikey2fUserCanRemoveKey":"Autoriser les utilisateurs à effacer leur Yubikey",
 "zeroConfExplanations":"Le serveur ne dispose pas de configuration. Cette configuration de base vous permet d'en initialiser une."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/he.json b/lemonldap-ng-manager/site/htdocs/static/languages/he.json
index 98449b37d46aea2aba97875065afc2721cbbde62..7b85e0d3e3ac173c6da79bea1eafc0a9992eae3f 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/he.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/he.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"חוקר הפעלות אימות דו־שלבי",
+"2fid":"מזהה",
 "2ndFA":"גורמים נוספים",
 "ADPwdExpireWarning":"אזהרת תפוגת סיסמה",
 "ADPwdMaxAge":"גיל מרבי לסיסמה",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"כתובת שירות",
 "yubikey2fUserCanRemoveKey":"לאפשר למשתמש להסיר Yubikey",
 "zeroConfExplanations":"Server has no configuration. Use template to save the first."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json
index 8d51a166b1ae02887f5a644e6062356eece6f24e..35805ec1a5af549904f3603ec7b6b3dd1c8c1e18 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"Esploratore di sessioni 2ndFA",
+"2fid":"Identificatore",
 "2ndFA":"Secondi fattori",
 "ADPwdExpireWarning":"Avviso di scadenza password",
 "ADPwdMaxAge":"Età massima della password",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"URL del servizio",
 "yubikey2fUserCanRemoveKey":"Autorizza l'utente a rimuovere la Yubikey",
 "zeroConfExplanations":"Il server non ha alcuna configurazione. Utilizza il modello per salvare il primo."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
index 0867e71914ad4dd9855ce6ec9acfb19399e8d8d6..9d22b08988182e9452c8a74465477b783881627e 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"Eksplorator sesji 2ndFA",
+"2fid":"Identyfikator",
 "2ndFA":"Drugie czynniki",
 "ADPwdExpireWarning":"Ostrzeżenie o wygaśnięciu hasła",
 "ADPwdMaxAge":"Maksymalny czas ważności hasła",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"URL usługi",
 "yubikey2fUserCanRemoveKey":"Pozwól użytkownikowi usunąć Yubikey",
 "zeroConfExplanations":"Serwer nie ma konfiguracji. Użyj szablonu, aby zapisać pierwszy."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
index 0b3dda6a130db8b67f2bfb2554b97e79152659ef..4cf4e0152213bc3ceec767b71bed6616d45386ff 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"2ndFA oturumları gezgini",
+"2fid":"Tanımlayıcı",
 "2ndFA":"İki Faktörlü Kimlik Doğrulama",
 "ADPwdExpireWarning":"Parola kullanım süresi uyarısı",
 "ADPwdMaxAge":"Parola maksimum sınırı",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"Servis URL'si",
 "yubikey2fUserCanRemoveKey":"Yubikey'i kaldırmak için kullanıcıya izin ver",
 "zeroConfExplanations":"Sunucunun yapılandırması yok. Şimdi bir tane kaydetmek için şablonu kullanın."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
index 9830c6827ee1d0dae7b4298abf719bbc4470f10c..155a605418c199c312b5ae76984e51efd19b6299 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"2ndFA sessions explorer",
+"2fid":"Trình định danh",
 "2ndFA":"Second Factors",
 "ADPwdExpireWarning":"Cảnh báo mật khẩu hết hạn",
 "ADPwdMaxAge":"Thời gian tối đa của mật khẩu",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"Dịch vụ URL",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"Máy chủ không có cấu hình. Sử dụng mẫu để lưu đầu tiên. "
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
index 14860b8355584d740454742f0498d14f756f4e1b..3d9434c10b26d1fee08cc76e885b5375832a61f5 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"雙因素驗證工作階段探索程式",
+"2fid":"識別符號",
 "2ndFA":"雙因素",
 "ADPwdExpireWarning":"密碼過期警告",
 "ADPwdMaxAge":"密碼最大可使用時間",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"服務 URL",
 "yubikey2fUserCanRemoveKey":"允許使用者移除 Yubikey",
 "zeroConfExplanations":"伺服器未設定。使用飯本來儲存第一個。"
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
index cc508c820f5e0d5088afbf0721a7d323470d42ab..182af34407482443225052639df1cda41e9bc06c 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
@@ -1,5 +1,6 @@
 {
 "2faSessions":"雙因素驗證工作階段探索程式",
+"2fid":"識別符號",
 "2ndFA":"雙因素",
 "ADPwdExpireWarning":"密碼過期警告",
 "ADPwdMaxAge":"密碼最大可使用時間",
@@ -1313,4 +1314,4 @@
 "yubikey2fUrl":"服務 URL",
 "yubikey2fUserCanRemoveKey":"允許使用者移除 Yubikey",
 "zeroConfExplanations":"伺服器未設定。使用飯本來儲存第一個。"
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/templates/2ndfa.tpl b/lemonldap-ng-manager/site/templates/2ndfa.tpl
index e4367b936a873376ef5f68b207d7064b3fcc4cca..32d250d2f4039cb40e321f6c1594851cccff61fb 100644
--- a/lemonldap-ng-manager/site/templates/2ndfa.tpl
+++ b/lemonldap-ng-manager/site/templates/2ndfa.tpl
@@ -106,9 +106,9 @@
     <div ng-if="!node.nodes" >
       <th class="col-md-3" ng-if="!node.sfrow">{{translate(node.title)}}</th>
       <td class="data-{{node.epoch}}" ng-if="node.sfrow" >{{node.title}}</td>
-      <th class="col-md-3" ng-if="node.title=='type'">{{translate(node.value)}}</th>
-      <td class="col-md-3 data-{{node.epoch}}" ng-if="node.title!='type'" >{{node.value}}</td>
-      <th class="col-md-3" ng-if="node.title=='type'">{{translate(node.epoch)}}</th>
+      <th class="col-md-3" ng-if="!node.sfrow">{{translate(node.value)}}</th>
+      <td class="col-md-3 data-{{node.epoch}}" ng-if="node.sfrow" >{{node.value}}</td>
+      <th class="col-md-3" ng-if="!node.sfrow">{{translate(node.epoch)}}</th>
       <td class="col-md-3 data-{{node.epoch}}" ng-if="node.sfrow">{{localeDate(node.epoch)}}</td>
       <td class="data-{{node.epoch}}">
         <span ng-if="node.sfrow" class="link text-danger glyphicon glyphicon-minus-sign" ng-click="delete2FA(node.title, node.epoch)"></span>
diff --git a/lemonldap-ng-manager/t/60-2ndfa.t b/lemonldap-ng-manager/t/60-2ndfa.t
index 0ecd12ad87a74a4ac5f19b1c2e5b4da06e61e912..e63b5840e2b9581d465210c6d31e1117c41f675e 100644
--- a/lemonldap-ng-manager/t/60-2ndfa.t
+++ b/lemonldap-ng-manager/t/60-2ndfa.t
@@ -32,6 +32,7 @@ sub newSession {
             uid           => $uid,
             _utime        => time,
             _session_kind => $kind,
+            _session_uid  => $uid,
             _2fDevices    => to_json($sfaDevices),
         }
     );
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Password.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Password.pm
index f6e7c32d61ae3c5c013b54594e27c94b5f579e92..b0f01c0c2c87e757caf8e3c2a3a57e10f5ec7120 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Password.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Password.pm
@@ -8,6 +8,7 @@ use strict;
 use Mouse;
 use JSON qw(from_json to_json);
 use Lemonldap::NG::Common::Crypto;
+use Lemonldap::NG::Common::Util qw/display2F/;
 use Lemonldap::NG::Portal::Main::Constants qw(
   PE_OK
   PE_ERROR
@@ -82,6 +83,7 @@ sub run {
 sub verify {
     my ( $self, $req, $session ) = @_;
     my ( $password, $password_device, $secret );
+    my $uid = $session->{ $self->conf->{whatToTrace} };
 
     $self->logger->debug( $self->prefix . '2f: verification' );
 
@@ -103,13 +105,13 @@ sub verify {
     }
 
     if ( $password eq $self->crypto->decrypt($secret) ) {
-        $self->userLogger->info( $self->prefix . '2f: correct' );
+
+        $self->userLogger->info( "User $uid authenticated with 2F device: "
+              . display2F($password_device) );
         return PE_OK;
     }
     else {
-        $self->userLogger->notice( $self->prefix
-              . '2f: invalid for '
-              . $session->{ $self->conf->{whatToTrace} } );
+        $self->userLogger->notice( $self->prefix . '2f: invalid for ' . $uid );
         return PE_BADCREDENTIALS;
     }
 }
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Generic.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Generic.pm
index 224b369caab26f82a4f203c3bf6970885f958ee0..c5e899a3b8c08f652208c650e497811a35ce7927 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Generic.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Generic.pm
@@ -131,8 +131,6 @@ sub run {
             )
           )
         {
-            $self->userLogger->notice( $self->prefix
-                  . "2f: registration of $genericname succeeds for $user" );
             return [
                 200,
                 [
@@ -160,8 +158,6 @@ sub run {
 
         if ( $self->del2fDevice( $req, $req->userData, $self->prefix, $epoch ) )
         {
-            $self->userLogger->notice(
-                $self->prefix . "2f: device deleted for $user" );
             return [
                 200,
                 [
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Password.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Password.pm
index 02b3173200adead46c507bf870cea6963ed83e83..068a652ec21f9ba0d61358364be3a6679a4cb31a 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Password.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Password.pm
@@ -110,8 +110,6 @@ sub run {
             )
           )
         {
-            $self->userLogger->notice( $self->prefix
-                  . "2f: registration of password succeeds for $user" );
             return [
                 200,
                 [
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm
index b593162768907df84710cdf6f16a64aa21c6ae8b..e365359827cc170f4f2ea31b89664630bae022d3 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm
@@ -119,8 +119,6 @@ sub run {
             )
           )
         {
-            $self->userLogger->notice( $self->prefix
-                  . "2f: registration of $TOTPName succeeds for $user" );
             return [
                 200,
                 [
@@ -192,8 +190,6 @@ sub run {
           or return $self->p->sendError( $req,
             $self->prefix . '2f: "epoch" parameter is missing', 400 );
         if ( $self->del2fDevice( $req, $req->userData, $self->type, $epoch ) ) {
-            $self->userLogger->notice(
-                $self->prefix . "2f: device deleted for $user" );
             return [
                 200,
                 [
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm
index 15cf90ee7176f837e4215e5db8c4686d81bce682..1e5edc440e67f1e34401d19112c2afc915695823 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm
@@ -39,7 +39,7 @@ sub run {
 
         # Read existing 2F device(s)
         my @alldevices = $self->find2fDevicesByType( $req, $req->userData );
-        my $challenge = $self->crypter->registrationChallenge;
+        my $challenge  = $self->crypter->registrationChallenge;
         $self->logger->debug(
             $self->prefix . "2f: registration challenge ($challenge)" );
         return [
@@ -92,9 +92,6 @@ sub run {
                     )
                   )
                 {
-                    $self->userLogger->notice( $self->prefix
-                          . "2f: registration of device $keyName succeeds for $user"
-                    );
                     return [
                         200,
                         [
@@ -210,8 +207,6 @@ sub run {
           or return $self->p->sendError( $req,
             $self->prefix . '2f: "epoch" parameter is missing', 400 );
         if ( $self->del2fDevice( $req, $req->userData, $self->type, $epoch ) ) {
-            $self->userLogger->notice(
-                $self->prefix . "2f: device deleted for $user" );
             return [
                 200,
                 [
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/WebAuthn.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/WebAuthn.pm
index 135fcd1c3ed702db454527b058581dd33ef4c948..6f4b7d901437ebed1ffd0cb67b8d0bf500912297 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/WebAuthn.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/WebAuthn.pm
@@ -192,8 +192,6 @@ sub _registration {
         )
       )
     {
-        $self->userLogger->notice(
-            $self->prefix . "2f: registration of $keyName succeeds for $user" );
         return $self->p->sendJSONresponse( $req, { result => 1 } );
     }
     else {
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Yubikey.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Yubikey.pm
index 749aa36e1b22c401d7cb9621e7de47da91b9976f..1d037f71a9b2ce52d605f9cd198ff0bd66fc554b 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Yubikey.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/Yubikey.pm
@@ -71,9 +71,6 @@ sub run {
                 )
               )
             {
-                $self->userLogger->notice( $self->prefix
-                      . "2f: registration of device $UBKName succeeds for $user"
-                );
                 return $self->p->sendHtml(
                     $req, 'error',
                     params => {
@@ -110,8 +107,6 @@ sub run {
           or return $self->p->sendError( $req,
             $self->prefix . '2f: "epoch" parameter is missing', 400 );
         if ( $self->del2fDevice( $req, $req->userData, $self->type, $epoch ) ) {
-            $self->userLogger->notice(
-                $self->prefix . "2f: device deleted for $user" );
             return [
                 200,
                 [
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/TOTP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/TOTP.pm
index 3acca045cfb72664d551796a80f6537527cd4e90..c936b711167c8ec834a259a17f08a4ecb2d1003c 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/TOTP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/TOTP.pm
@@ -14,6 +14,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
   PE_FORMEMPTY
   PE_SENDRESPONSE
 );
+use Lemonldap::NG::Common::Util qw/display2F/;
 
 our $VERSION = '2.0.16';
 
@@ -65,6 +66,7 @@ sub run {
 sub verify {
     my ( $self, $req, $session ) = @_;
     my ( $code, $secret, @totp2f );
+    my $uid = $session->{ $self->conf->{whatToTrace} };
     $self->logger->debug( $self->prefix . '2f: verification' );
 
     unless ( $code = $req->param('code') ) {
@@ -73,7 +75,13 @@ sub verify {
     }
 
     @totp2f = $self->find2fDevicesByType( $req, $session, $self->type );
-    $secret = $_->{_secret} foreach @totp2f;
+    my $_2fDevice;
+    foreach (@totp2f) {
+        if ( $_->{_secret} ) {
+            $secret    = $_->{_secret};
+            $_2fDevice = $_;
+        }
+    }
     unless ($secret) {
         $self->logger->debug( $self->prefix . '2f: no secret found' );
         return PE_BADOTP;
@@ -88,13 +96,13 @@ sub verify {
     return PE_ERROR if $r == -1;
 
     if ($r) {
-        $self->userLogger->info( $self->prefix . '2f: succeed' );
+        $self->userLogger->info( "User $uid authenticated with 2F device: "
+              . display2F($_2fDevice) );
         return PE_OK;
     }
     else {
-        $self->userLogger->notice( $self->prefix
-              . '2f: invalid attempt for '
-              . $session->{ $self->conf->{whatToTrace} } );
+        $self->userLogger->notice(
+            $self->prefix . '2f: invalid attempt for ' . $uid );
         return PE_BADOTP;
     }
 }
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm
index b64fabe3a86de6442b8d1618025b120e1f044a9c..ee788d3fc3b7a695291a616eaa8faed2e0031cca 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm
@@ -8,6 +8,7 @@ use strict;
 use Mouse;
 use JSON qw(from_json to_json);
 use MIME::Base64 qw(decode_base64url);
+use Lemonldap::NG::Common::Util qw/display2F/;
 use Lemonldap::NG::Portal::Main::Constants qw(
   PE_OK
   PE_ERROR
@@ -106,6 +107,7 @@ sub run {
 sub verify {
     my ( $self, $req, $session ) = @_;
     my $crypter;
+    my $uid = $session->{ $self->conf->{whatToTrace} };
 
     # Check U2F signature
     if (    my $resp = $req->param('signature')
@@ -151,13 +153,17 @@ sub verify {
             return $self->fail($req);
         }
         if ( $crypter->authenticationVerify($resp) ) {
-            $self->userLogger->info( $self->prefix . '2f: signature verified' );
+
+            # Lookup 2f device from authenticator's keyHandle
+            my $device = $req->data->{u2fkhtodev}->{ $data->{keyHandle} };
+            $self->userLogger->info( "User $uid authenticated with 2F device: "
+                  . display2F($device) );
             return PE_OK;
         }
         else {
             $self->userLogger->notice( $self->prefix
                   . '2f: unvalid signature for '
-                  . $session->{ $self->conf->{whatToTrace} } . ' ('
+                  . $uid . ' ('
                   . Crypt::U2F::Server::u2fclib_getError()
                   . ')' );
             $req->error(PE_U2FFAILED);
@@ -165,9 +171,8 @@ sub verify {
         }
     }
     else {
-        $self->userLogger->notice( $self->prefix
-              . '2f: no valid response for user '
-              . $session->{ $self->conf->{whatToTrace} } );
+        $self->userLogger->notice(
+            $self->prefix . '2f: no valid response for user ' . $uid );
         $req->authResult(PE_U2FFAILED);
         return $self->fail($req);
     }
@@ -202,6 +207,7 @@ sub loadUser {
 
         foreach (@u2fs) {
             $kh = $_->{_keyHandle};
+            $req->data->{u2fkhtodev}->{$kh} = $_;
             $uk = decode_base64url( $_->{_userKey} );
             $self->logger->debug(
                 $self->prefix . "2f: append crypter with kh = $kh" );
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm
index c4b85e1c6851b575ea236a5b5fb46d135ec19837..56b487bb0bc3db06e68771795866ab7dae4aa909 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm
@@ -7,6 +7,7 @@ package Lemonldap::NG::Portal::2F::Yubikey;
 use strict;
 use Mouse;
 use JSON qw(from_json to_json);
+use Lemonldap::NG::Common::Util qw/display2F/;
 use Lemonldap::NG::Portal::Main::Constants qw(
   PE_OK
   PE_ERROR
@@ -89,44 +90,63 @@ sub init {
     return $self->SUPER::init();
 }
 
-sub _findYubikey {
-    my ( $self, $req, $session ) = @_;
+sub _findYubikeyForCode {
+    my ( $self, $req, $session, $code ) = @_;
     my ( $yubikey, @ubk2f );
 
+    my $id_from_code = substr( $code, 0, $self->conf->{yubikey2fPublicIDSize} );
+
     # First, lookup from session attribute
     if ( $self->conf->{yubikey2fFromSessionAttribute} ) {
         my $attr = $self->conf->{yubikey2fFromSessionAttribute};
         $yubikey = $session->{$attr};
+        if ($yubikey) {
+            if ( $yubikey eq $id_from_code ) {
+                return { _yubikey => $yubikey, };
+            }
+            else {
+                return;
+            }
+        }
     }
 
     # If we didn't find a key, lookup psession
     if ( !$yubikey and $session->{_2fDevices} ) {
         @ubk2f = $self->find2fDevicesByType( $req, $session, $self->type );
-        if ( my $code = $req->param('code') ) {
-            $yubikey = $_->{_yubikey} foreach grep {
-                $_->{_yubikey} eq
-                  substr( $code, 0, $self->conf->{yubikey2fPublicIDSize} )
-            } @ubk2f;
-        }
-        else {
-            $yubikey = $_->{_yubikey} foreach @ubk2f;
-        }
+        my @results = grep { $_->{_yubikey} eq $id_from_code } @ubk2f;
+        return $results[0];
     }
+    return;
+}
+
+sub _hasYubikey {
+    my ( $self, $req, $session ) = @_;
+    my ( $yubikey, @ubk2f );
 
-    return $yubikey || '';
+    # Does the user have a session attribute
+    if ( $self->conf->{yubikey2fFromSessionAttribute} ) {
+        my $attr = $self->conf->{yubikey2fFromSessionAttribute};
+        $yubikey = $session->{$attr};
+    }
+
+    # If we didn't find a value, lookup registered devices
+    if ( !$yubikey and $session->{_2fDevices} ) {
+        @ubk2f   = $self->find2fDevicesByType( $req, $session, $self->type );
+        $yubikey = $_->{_yubikey} foreach @ubk2f;
+    }
+
+    return ( $yubikey ? 1 : 0 );
 }
 
 sub run {
     my ( $self, $req, $token ) = @_;
-    my $yubikey = $self->_findYubikey( $req, $req->sessionInfo );
-    unless ($yubikey) {
+    unless ( $self->_hasYubikey( $req, $req->sessionInfo ) ) {
         $self->userLogger->warn( $self->prefix
               . '2f: user '
               . $req->{sessionInfo}->{ $self->conf->{whatToTrace} }
               . ' has no device registered' );
         return PE_BADOTP;
     }
-    $self->logger->debug( $self->prefix . "2f: found $yubikey" );
 
     # Prepare form
     my ( $checkLogins, $stayConnected ) = $self->getFormParams($req);
@@ -157,12 +177,8 @@ sub verify {
     }
 
     # Verify OTP
-    my $yubikey = $self->_findYubikey( $req, $session );
-    if (
-        index( $yubikey,
-            substr( $code, 0, $self->conf->{yubikey2fPublicIDSize} ) ) == -1
-      )
-    {
+    my $yubikey = $self->_findYubikeyForCode( $req, $session, $code );
+    unless ($yubikey) {
         $self->userLogger->warn( $self->prefix . '2f: device not registered' );
         return PE_BADOTP;
     }
@@ -173,6 +189,15 @@ sub verify {
         $self->userLogger->warn( $self->prefix . '2f: verification failed' );
         return PE_BADOTP;
     }
+    my $uid = $session->{ $self->conf->{whatToTrace} };
+    if ( $yubikey->{epoch} ) {
+        $self->userLogger->info(
+            "User $uid authenticated with 2F device: " . display2F($yubikey) );
+    }
+    else {
+        $self->userLogger->info("User $uid authenticated with Yubikey");
+    }
+
     return PE_OK;
 }
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/2fDevices.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/2fDevices.pm
index b51219c9897e584978c141042d5d36e1dab77b1a..214dc6ef010a24ce2f66d08337de322a28ddb0e8 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/2fDevices.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/2fDevices.pm
@@ -22,6 +22,7 @@ of this module
 
 use strict;
 use Mouse::Role;
+use Lemonldap::NG::Common::Util qw/display2F/;
 use JSON;
 
 requires qw(p conf logger);
@@ -103,9 +104,10 @@ sub add2fDevice {
     my $_2fDevices = $self->get2fDevices( $req, $info );
 
     push @{$_2fDevices}, $device;
-    $self->logger->debug(
-        "Append 2F device: { type => $device->{type}, name => $device->{name} }"
-    );
+
+    my $uid = $info->{ $self->conf->{whatToTrace} };
+    $self->userLogger->notice(
+        "User " . $uid . " registered 2F device: " . display2F($device) );
     $self->p->updatePersistentSession( $req,
         { _2fDevices => to_json($_2fDevices) } );
     return 1;
@@ -156,8 +158,11 @@ sub del2fDevices {
           @updated_2fDevices;
         if ( @updated_2fDevices < $size_before ) {
             $need_update = 1;
-            $self->logger->debug(
-                "Deleted 2F device: { type => $type, epoch => $epoch }");
+            my $uid = $info->{ $self->conf->{whatToTrace} };
+            $self->userLogger->notice( "User "
+                  . $uid
+                  . " deleted 2F device: "
+                  . display2F($device_spec) );
         }
     }
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Code2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Code2F.pm
index b06837dda48378949bf891e72455379c2de75d4c..3a1050c2582a6fea7f220fceaf1b93ab2ceb4acf 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Code2F.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Code2F.pm
@@ -10,6 +10,7 @@ package Lemonldap::NG::Portal::Lib::Code2F;
 
 use strict;
 use Mouse;
+use Lemonldap::NG::Common::Util qw/display2F/;
 
 use Lemonldap::NG::Portal::Main::Constants qw(
   PE_OK
@@ -131,9 +132,9 @@ sub _resend {
     {
 
         # Resend code and update last retry
-        unless ($self->sendCode( $req, $session, $code )){
+        unless ( $self->sendCode( $req, $session, $code ) ) {
             return $self->p->do( $req, [ sub { PE_ERROR } ] );
-        };
+        }
         $self->ott->updateToken( $token, __lastRetry => time );
     }
     else {
@@ -151,10 +152,18 @@ sub verify {
         return PE_FORMEMPTY;
     }
 
-    $self->populateDestAttribute( $req, $req->sessionInfo );
+    $self->populateDestAttribute( $req, $session );
 
-    return $self->verify_supplied_code( $req, $session, $usercode );
+    my $res = $self->verify_supplied_code( $req, $session, $usercode );
 
+    # If we authenticated the user using a 2F Device, log it
+    if ( $res == PE_OK && $req->data->{__2fDevice_registrable} ) {
+        my $uid    = $session->{ $self->conf->{whatToTrace} };
+        my $device = $req->data->{__2fDevice_registrable};
+        $self->userLogger->info(
+            "User $uid authenticated with 2F device: " . display2F($device) );
+    }
+    return $res;
 }
 
 sub verify_supplied_code {
@@ -236,7 +245,9 @@ sub populateDestAttribute {
         my @registered_devices =
           $self->find2fDevicesByType( $req, $sessionInfo, $self->prefix );
         if (@registered_devices) {
+
             $sessionInfo->{destination} = $registered_devices[0]->{_generic};
+            $req->data->{__2fDevice_registrable} = $registered_devices[0];
         }
     }
 }
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/WebAuthn.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/WebAuthn.pm
index 90e98a8dc40ee7ba9414a1ee02ee80f4195690ce..63db100020168b0e652d77faf9a5724814e09b5f 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/WebAuthn.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/WebAuthn.pm
@@ -8,6 +8,7 @@ use Digest::SHA qw(sha256);
 use URI;
 use Carp;
 with 'Lemonldap::NG::Portal::Lib::2fDevices';
+use Lemonldap::NG::Common::Util qw/display2F/;
 
 our $VERSION = '2.0.16';
 
@@ -186,9 +187,10 @@ sub validateAssertion {
 
     if ( $validation_result->{success} == 1 ) {
         my $new_signature_count = $validation_result->{signature_count};
-        $self->userLogger->info(
-                "Successfully verified signature with count "
-              . "$new_signature_count for $user" );
+
+        $self->userLogger->info( "User $user authenticated with 2F device: "
+              . display2F($matching_credential)
+              . " (signature count: $new_signature_count) " );
 
         # Update storedSignCount to be the value of authData.signCount
         $self->update2fDevice( $req, $data, $self->type,
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm
index 30fe3ec3e4d42ba6b088c74cb88577ca8c9004c8..d19ba6ded13f9921027bdbd9417185251ed83e24 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm
@@ -141,7 +141,7 @@ sub _verify {
     # Else restore session
     $req->mustRedirect(1);
     $self->userLogger->notice( $self->prefix
-          . '2f verification for '
+          . '2f verification succeeded for '
           . $req->sessionInfo->{ $self->conf->{whatToTrace} } );
 
     if ( my $l = $self->authnLevel ) {