diff --git a/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.js b/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.js
index 10916bc69..7c3509981 100644
--- a/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.js
+++ b/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.js
@@ -68,7 +68,7 @@ $(window).on("load", function() {
       else
       {
           newval = "running";
-          window.setTimeout( launchAuthenticationChoice, 1000 );
+          window.setTimeout( launchAuthenticationChoice, 0 );
       }
       // store the new value
       $( "input#rememberStopped" ).val(newval);
@@ -86,11 +86,12 @@ $(window).on("load", function() {
 
       if ( isStopped != "stopped" )
       {
+          timer--;
+          // display decremented timer in the appropriate html element
+          $( "#remembertimer span" ).text(timer);
+
           if ( timer > 0 )
           {
-              timer--;
-              // display decremented timer in the appropriate html element
-              $( "#remembertimer span" ).text(timer);
               // wait for another 1s
               window.setTimeout( launchAuthenticationChoice, 1000 );
           }
@@ -123,8 +124,10 @@ $(window).on("load", function() {
           $( 'input[name="rememberauthchoice"]' ).each(function() {
             $( this ).val('true');
           });
+          // increment timer for starting to correct time
+          $( "#remembertimer span" ).text( parseInt($( "#remembertimer span" ).text()) + 1 );
           // launch remembered authentication choice when timer reaches 0
-          window.setTimeout( launchAuthenticationChoice, 1000 );
+          window.setTimeout( launchAuthenticationChoice, 0 );
       }
       else
       {
diff --git a/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js b/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js
index 2d9de9fd3..56c80b4be 100644
--- a/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js
+++ b/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js
@@ -1 +1 @@
-$(window).on("load",function(){function t(){var e=$("#remembertimer span").text();"stopped"!=$("input#rememberStopped").val()&&(0<e?(e--,$("#remembertimer span").text(e),window.setTimeout(t,1e3)):(e="#"+$.cookie(a)+" form",$(e).submit()))}$("div.message-positive").addClass("alert-success"),$("div.message-warning").addClass("alert-warning"),$("div.message-negative").addClass("alert-danger"),$("table.info").addClass("table"),$(".notifCheck").addClass("checkbox"),$('.collapse li[class!="dropdown"]').on("click",function(){$(".navbar-toggler").hasClass("collapsed")||$(".navbar-toggler").trigger("click")}),$("#authMenu .nav-link").on("click",function(e){window.datas.choicetab=e.target.hash.substr(1)}),$("#remove2fModal").on("show.bs.modal",function(e){var t=$(e.relatedTarget),a=t.attr("device"),e=t.attr("epoch"),t=$(this);t.find(".remove2f").attr("device",a),t.find(".remove2f").attr("epoch",e)}),$(".nav-item").click(function(){$(".nav-item").attr("tabIndex",0)}),$(".nav-item").focusin(function(){$(".nav-item").attr("tabIndex",0)}),$(".nav-item").focusout(function(){$(".nav-item").attr("tabIndex",0)}),$("#globalrememberauthchoice").change(function(){var e=this.checked;$('input[name="rememberauthchoice"]').each(function(){$(this).val(e)})}),$("#buttonRememberStopped").click(function(){var e;"stopped"!=$("input#rememberStopped").val()?e="stopped":(e="running",window.setTimeout(t,1e3)),$("input#rememberStopped").val(e),$("#remembertimer").hide(),$("#globalrememberauthchoicecontainer").css("display","flex")});var a=$("#rememberCookieName").val();9==$("#errormsg div span").attr("trmsg")&&(void 0!==a&&void 0!==$.cookie(a)?($("#remembertimer").css("display","flex"),$("#globalrememberauthchoice").prop("checked",!0),$('input[name="rememberauthchoice"]').each(function(){$(this).val("true")}),window.setTimeout(t,1e3)):$("#globalrememberauthchoicecontainer").css("display","flex"))});
\ No newline at end of file
+$(window).on("load",function(){function t(){var e=$("#remembertimer span").text();"stopped"!=$("input#rememberStopped").val()&&(e--,$("#remembertimer span").text(e),0<e?window.setTimeout(t,1e3):(e="#"+$.cookie(a)+" form",$(e).submit()))}$("div.message-positive").addClass("alert-success"),$("div.message-warning").addClass("alert-warning"),$("div.message-negative").addClass("alert-danger"),$("table.info").addClass("table"),$(".notifCheck").addClass("checkbox"),$('.collapse li[class!="dropdown"]').on("click",function(){$(".navbar-toggler").hasClass("collapsed")||$(".navbar-toggler").trigger("click")}),$("#authMenu .nav-link").on("click",function(e){window.datas.choicetab=e.target.hash.substr(1)}),$("#remove2fModal").on("show.bs.modal",function(e){var t=$(e.relatedTarget),a=t.attr("device"),e=t.attr("epoch"),t=$(this);t.find(".remove2f").attr("device",a),t.find(".remove2f").attr("epoch",e)}),$(".nav-item").click(function(){$(".nav-item").attr("tabIndex",0)}),$(".nav-item").focusin(function(){$(".nav-item").attr("tabIndex",0)}),$(".nav-item").focusout(function(){$(".nav-item").attr("tabIndex",0)}),$("#globalrememberauthchoice").change(function(){var e=this.checked;$('input[name="rememberauthchoice"]').each(function(){$(this).val(e)})}),$("#buttonRememberStopped").click(function(){var e;"stopped"!=$("input#rememberStopped").val()?e="stopped":(e="running",window.setTimeout(t,0)),$("input#rememberStopped").val(e),$("#remembertimer").hide(),$("#globalrememberauthchoicecontainer").css("display","flex")});var a=$("#rememberCookieName").val();9==$("#errormsg div span").attr("trmsg")&&(void 0!==a&&void 0!==$.cookie(a)?($("#remembertimer").css("display","flex"),$("#globalrememberauthchoice").prop("checked",!0),$('input[name="rememberauthchoice"]').each(function(){$(this).val("true")}),$("#remembertimer span").text(parseInt($("#remembertimer span").text())+1),window.setTimeout(t,0)):$("#globalrememberauthchoicecontainer").css("display","flex"))});
\ No newline at end of file
diff --git a/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js.map b/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js.map
index 8b1b2f3ee..df51b0508 100644
--- a/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js.map
+++ b/lemonldap-ng-portal/site/htdocs/static/bootstrap/js/skin.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["skin.js"],"names":["$","window","on","launchAuthenticationChoice","timer","text","val","setTimeout","choiceform","cookie","rememberCookieName","submit","addClass","hasClass","trigger","e","datas","choicetab","target","hash","substr","event","button","relatedTarget","device","attr","epoch","modal","this","find","click","focusin","focusout","change","checked","each","newval","hide","css","prop"],"mappings":"AAAAA,EAAEC,QAAQC,GAAG,OAAQ,WAgFnB,SAASC,IAGL,IAAIC,EAAQJ,EAAG,uBAAwBK,OAGrB,WAFFL,EAAG,yBAA0BM,QAI5B,EAARF,GAEDA,IAEAJ,EAAG,uBAAwBK,KAAKD,GAEhCH,OAAOM,WAAYJ,EAA4B,OAK3CK,EAAa,IAAMR,EAAES,OAAOC,GAAsB,QACtDV,EAAGQ,GAAaG,WAjG5BX,EAAE,wBAAwBY,SAAS,iBACnCZ,EAAE,uBAAuBY,SAAS,iBAClCZ,EAAE,wBAAwBY,SAAS,gBAEnCZ,EAAE,cAAcY,SAAS,SAEzBZ,EAAE,eAAeY,SAAS,YAG1BZ,EAAE,mCAAmCE,GAAG,QAAS,WAC1CF,EAAE,mBAAmBa,SAAS,cACjCb,EAAE,mBAAmBc,QAAQ,WAKjCd,EAAE,uBAAuBE,GAAG,QAAS,SAAUa,GAC3Cd,OAAOe,MAAMC,UAAYF,EAAEG,OAAOC,KAAKC,OAAO,KAIlDpB,EAAE,kBAAkBE,GAAG,gBAAiB,SAAUmB,GAClD,IAAIC,EAAStB,EAAEqB,EAAME,eACjBC,EAASF,EAAOG,KAAK,UACrBC,EAAQJ,EAAOG,KAAK,SACpBE,EAAQ3B,EAAE4B,MAGdD,EAAME,KAAK,aAAaJ,KAAK,SAAUD,GACvCG,EAAME,KAAK,aAAaJ,KAAK,QAASC,KAOtC1B,EAAE,aAAa8B,MAAM,WACnB9B,EAAE,aAAayB,KAAM,WAAY,KAEnCzB,EAAE,aAAa+B,QAAQ,WACrB/B,EAAE,aAAayB,KAAM,WAAY,KAEnCzB,EAAE,aAAagC,SAAS,WACtBhC,EAAE,aAAayB,KAAM,WAAY,KAKnCzB,EAAE,6BAA6BiC,OAAO,WAClC,IAAIC,EAAUN,KAAKM,QACnBlC,EAAG,oCAAqCmC,KAAK,WACzCnC,EAAG4B,MAAOtB,IAAI4B,OAMtBlC,EAAE,0BAA0B8B,MAAM,WAC9B,IACIM,EACU,WAFDpC,EAAG,yBAA0BM,MAItC8B,EAAS,WAITA,EAAS,UACTnC,OAAOM,WAAYJ,EAA4B,MAGnDH,EAAG,yBAA0BM,IAAI8B,GACjCpC,EAAG,kBAAmBqC,OACtBrC,EAAG,sCAAuCsC,IAAI,UAAW,UAiC7D,IAAI5B,EAAqBV,EAAG,uBAAwBM,MAGnC,GAFDN,EAAG,sBAAuByB,KAAK,gBAKH,IAAvBf,QACiC,IAAjCV,EAAES,OAAOC,IAItBV,EAAG,kBAAmBsC,IAAI,UAAW,QAErCtC,EAAE,6BAA6BuC,KAAK,WAAU,GAC9CvC,EAAG,oCAAqCmC,KAAK,WAC3CnC,EAAG4B,MAAOtB,IAAI,UAGhBL,OAAOM,WAAYJ,EAA4B,MAKjDH,EAAG,sCAAuCsC,IAAI,UAAW"}
\ No newline at end of file
+{"version":3,"sources":["skin.js"],"names":["$","window","on","launchAuthenticationChoice","timer","text","val","setTimeout","choiceform","cookie","rememberCookieName","submit","addClass","hasClass","trigger","e","datas","choicetab","target","hash","substr","event","button","relatedTarget","device","attr","epoch","modal","this","find","click","focusin","focusout","change","checked","each","newval","hide","css","prop","parseInt"],"mappings":"AAAAA,EAAEC,QAAQC,GAAG,OAAQ,WAgFnB,SAASC,IAGL,IAAIC,EAAQJ,EAAG,uBAAwBK,OAGrB,WAFFL,EAAG,yBAA0BM,QAIzCF,IAEAJ,EAAG,uBAAwBK,KAAKD,GAEnB,EAARA,EAGDH,OAAOM,WAAYJ,EAA4B,MAK3CK,EAAa,IAAMR,EAAES,OAAOC,GAAsB,QACtDV,EAAGQ,GAAaG,WAlG5BX,EAAE,wBAAwBY,SAAS,iBACnCZ,EAAE,uBAAuBY,SAAS,iBAClCZ,EAAE,wBAAwBY,SAAS,gBAEnCZ,EAAE,cAAcY,SAAS,SAEzBZ,EAAE,eAAeY,SAAS,YAG1BZ,EAAE,mCAAmCE,GAAG,QAAS,WAC1CF,EAAE,mBAAmBa,SAAS,cACjCb,EAAE,mBAAmBc,QAAQ,WAKjCd,EAAE,uBAAuBE,GAAG,QAAS,SAAUa,GAC3Cd,OAAOe,MAAMC,UAAYF,EAAEG,OAAOC,KAAKC,OAAO,KAIlDpB,EAAE,kBAAkBE,GAAG,gBAAiB,SAAUmB,GAClD,IAAIC,EAAStB,EAAEqB,EAAME,eACjBC,EAASF,EAAOG,KAAK,UACrBC,EAAQJ,EAAOG,KAAK,SACpBE,EAAQ3B,EAAE4B,MAGdD,EAAME,KAAK,aAAaJ,KAAK,SAAUD,GACvCG,EAAME,KAAK,aAAaJ,KAAK,QAASC,KAOtC1B,EAAE,aAAa8B,MAAM,WACnB9B,EAAE,aAAayB,KAAM,WAAY,KAEnCzB,EAAE,aAAa+B,QAAQ,WACrB/B,EAAE,aAAayB,KAAM,WAAY,KAEnCzB,EAAE,aAAagC,SAAS,WACtBhC,EAAE,aAAayB,KAAM,WAAY,KAKnCzB,EAAE,6BAA6BiC,OAAO,WAClC,IAAIC,EAAUN,KAAKM,QACnBlC,EAAG,oCAAqCmC,KAAK,WACzCnC,EAAG4B,MAAOtB,IAAI4B,OAMtBlC,EAAE,0BAA0B8B,MAAM,WAC9B,IACIM,EACU,WAFDpC,EAAG,yBAA0BM,MAItC8B,EAAS,WAITA,EAAS,UACTnC,OAAOM,WAAYJ,EAA4B,IAGnDH,EAAG,yBAA0BM,IAAI8B,GACjCpC,EAAG,kBAAmBqC,OACtBrC,EAAG,sCAAuCsC,IAAI,UAAW,UAkC7D,IAAI5B,EAAqBV,EAAG,uBAAwBM,MAGnC,GAFDN,EAAG,sBAAuByB,KAAK,gBAKH,IAAvBf,QACiC,IAAjCV,EAAES,OAAOC,IAItBV,EAAG,kBAAmBsC,IAAI,UAAW,QAErCtC,EAAE,6BAA6BuC,KAAK,WAAU,GAC9CvC,EAAG,oCAAqCmC,KAAK,WAC3CnC,EAAG4B,MAAOtB,IAAI,UAGhBN,EAAG,uBAAwBK,KAAMmC,SAASxC,EAAG,uBAAwBK,QAAU,GAE/EJ,OAAOM,WAAYJ,EAA4B,IAKjDH,EAAG,sCAAuCsC,IAAI,UAAW"}
\ No newline at end of file