diff --git a/src/bundle/auth/Controller/userAuthentication.php b/src/bundle/auth/Controller/userAuthentication.php
index c945aa1dbb91e182dad808dcbcf8a8637d707738..16b7d70ecab26791640883e644b9ab3c5b867b71 100755
--- a/src/bundle/auth/Controller/userAuthentication.php
+++ b/src/bundle/auth/Controller/userAuthentication.php
@@ -139,7 +139,7 @@ class userAuthentication
         \laabs::setToken('AUTH', $accountToken, $tokenDuration);
 
         if ($this->securityPolicy['passwordValidity'] && $this->securityPolicy["passwordValidity"] != 0) {
-            $diff = ($currentDate->getTimestamp() - $userAccount->passwordLastChange->getTimestamp()) / 86400;
+            $diff = ($currentDate->getTimestamp() - $userAccount->passwordLastChange->getTimestamp()) / $tokenDuration;
             if ($diff > $this->securityPolicy['passwordValidity']) {
                 throw \laabs::newException('auth/userPasswordChangeRequestException');
             }
diff --git a/src/bundle/organization/Controller/abstractPosition.php b/src/bundle/organization/Controller/abstractPosition.php
index e6a3ae83730c1c89aa52c03ba11ddfc09205991e..0744354ea9ffb6d6b7a6666f85931600386f78d9 100755
--- a/src/bundle/organization/Controller/abstractPosition.php
+++ b/src/bundle/organization/Controller/abstractPosition.php
@@ -25,7 +25,7 @@ namespace bundle\organization\Controller;
  * Control of the organization types
  *
  * @package Organization
- * @author  Prosper DE LAURE <prosper.delaure@maarch.org> 
+ * @author  Prosper DE LAURE <prosper.delaure@maarch.org>
  */
 abstract class abstractPosition
 {
@@ -37,7 +37,7 @@ abstract class abstractPosition
      *
      * @return void
      */
-    public function __construct(\dependency\sdo\Factory $sdoFactory) 
+    public function __construct(\dependency\sdo\Factory $sdoFactory)
     {
         $this->sdoFactory = $sdoFactory;
     }
@@ -69,7 +69,7 @@ abstract class abstractPosition
             $position->organization->orgName = $organization->displayName;
 
             if ($position->default && !$currentOrg) {
-                \laabs::setToken("ORGANIZATION", $organization, 86400);
+                \laabs::setToken("ORGANIZATION", $organization, \laabs::configuration("auth")['securityPolicy']['sessionTimeout']);
                 $setToken = true;
             }
 
@@ -77,7 +77,7 @@ abstract class abstractPosition
         }
 
         if (!$setToken && !$currentOrg && $organizations) {
-            \laabs::setToken("ORGANIZATION", $organizations[0], 86400);
+            \laabs::setToken("ORGANIZATION", $organizations[0], \laabs::configuration("auth")['securityPolicy']['sessionTimeout']);
         }
 
         usort($positions, function ($pos1, $pos2) {
@@ -91,7 +91,7 @@ abstract class abstractPosition
         return $positions;
     }
 
-    
+
     /**
      * Get my current organization tree
      *
@@ -112,14 +112,14 @@ abstract class abstractPosition
 
     /**
      * Set my working positions
-     * @param organization/organization $orgId The organization identifier 
-     * 
+     * @param organization/organization $orgId The organization identifier
+     *
      * @return bool The result of the operation
      */
     public function setCurrentPosition($orgId)
     {
         if ($organization = $this->sdoFactory->read('organization/organization', $orgId)) {
-            \laabs::setToken("ORGANIZATION", $organization, 86400);
+            \laabs::setToken("ORGANIZATION", $organization, \laabs::configuration("auth")['securityPolicy']['sessionTimeout']);
 
             return true;
         }
@@ -130,7 +130,7 @@ abstract class abstractPosition
     }
 
     /**
-     * List user owner org and 
+     * List user owner org and
      *
      * @return object[] The list of organization ids
      */
@@ -282,7 +282,7 @@ abstract class abstractPosition
 
     /**
      * Get descendant archival profiles
-     * 
+     *
      * @return object[]
      */
     public function getdescendantArchivalProfiles()
@@ -311,7 +311,7 @@ abstract class abstractPosition
             if (!empty($descendantArchivalProfiles[$archivalProfileAccess->archivalProfileReference])){
                 continue;
             }
-            
+
             if ($archivalProfileAccess->archivalProfileReference != '*') {
                 $descendantArchivalProfiles[$archivalProfileAccess->archivalProfileReference] = $archivalProfileController->getByReference($archivalProfileAccess->archivalProfileReference);
             }
diff --git a/src/bundle/organization/Controller/servicePosition.php b/src/bundle/organization/Controller/servicePosition.php
index 6fb06c544c00303ae5a7410fb2ed40cf051f7118..247593c41eb0bb4695de0ec5ab440a49efcaebfa 100755
--- a/src/bundle/organization/Controller/servicePosition.php
+++ b/src/bundle/organization/Controller/servicePosition.php
@@ -44,7 +44,7 @@ class servicePosition extends abstractPosition
 
         $positions =  $this->sdoFactory->find('organization/servicePosition', "serviceAccountId = '".$accountToken->accountId."'");
 
-        \laabs::setToken("ORGANIZATION", $positions[0], 86400);
+        \laabs::setToken("ORGANIZATION", $positions[0], \laabs::configuration("auth")['securityPolicy']['sessionTimeout']);
 
         return $positions;
     }
diff --git a/src/presentation/maarchRM/Observer/authentication.php b/src/presentation/maarchRM/Observer/authentication.php
index 96189f2712c1fc1b2e5a536173e0472ff117f2bc..c7413f0117f2fdb8ec11aa2cdaa518c01fdee6a2 100755
--- a/src/presentation/maarchRM/Observer/authentication.php
+++ b/src/presentation/maarchRM/Observer/authentication.php
@@ -154,7 +154,7 @@ class authentication
 
             if (!$isUserPosition) {
                 \laabs::newException("auth/authenticationException", "Missing authentication credential", 403);
-                \laabs::setToken("ORGANIZATION", $default->organization, 86400);
+                \laabs::setToken("ORGANIZATION", $default->organization, \laabs::configuration("auth")['securityPolicy']['sessionTimeout']);
             }
         }