diff --git a/composer.json b/composer.json
index d27aa11..b7fa120 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
         "datatables.net/datatables.net-bs5": "2.0.8",
         "datatables.net/datatables.net-buttons-bs5": "3.0.2",
         "fortawesome/font-awesome": "v6.5.2",
-        "ltb-project/ltb-common": "dev-main",
+        "ltb-project/ltb-common": "dev-44-openldap-account-disabling",
         "twbs/bootstrap": "v5.3.2"
     },
     "scripts": {
diff --git a/htdocs/disableaccount.php b/htdocs/disableaccount.php
index f54b424..ce3e1ba 100644
--- a/htdocs/disableaccount.php
+++ b/htdocs/disableaccount.php
@@ -6,6 +6,7 @@
 $result = "";
 $dn = "";
 $password = "";
+$comment = "";
 
 if (isset($_POST["dn"]) and $_POST["dn"]) {
     $dn = $_POST["dn"];
@@ -13,6 +14,11 @@
     $result = "dnrequired";
 }
 
+if (isset($_POST["comment"]) and $_POST["comment"]) {
+    $comment = $_POST["comment"];
+}
+
+
 if (!$use_disableaccount) {
     $result = "actionforbidden";
 }
@@ -38,7 +44,7 @@
 }
 
 if ($audit_log_file) {
-    auditlog($audit_log_file, $dn, $audit_admin, "disableaccount", $result);
+    auditlog($audit_log_file, $dn, $audit_admin, "disableaccount", $result, $comment);
 }
 
 header('Location: index.php?page=display&dn='.$dn.'&disableaccountresult='.$result);
diff --git a/htdocs/display.php b/htdocs/display.php
index 1e0b7f3..0368aa7 100644
--- a/htdocs/display.php
+++ b/htdocs/display.php
@@ -118,7 +118,6 @@
             $isAccountEnabled = $directory->isAccountEnabled($ldap, $dn);
         }
 
-        $isLocked = false;
         $unlockDate = "";
         $isExpired = false;
         $ppolicy_entry = "";
@@ -145,29 +144,6 @@
             {
                 $pwdLockoutDuration = $ppolicy_entry[0]['pwdlockoutduration'][0];
             }
-            if(isset($entry[0]['pwdaccountlockedtime'][0]))
-            {
-                $pwdAccountLockedTime = $entry[0]['pwdaccountlockedtime'][0];
-            }
-            else
-            {
-                $pwdAccountLockedTime = null;
-            }
-
-            if ( $pwdAccountLockedTime === "000001010000Z" ) {
-                $isLocked = true;
-                unset($entry[0]['pwdaccountlockedtime']);
-            } else if (isset($pwdAccountLockedTime)) {
-                if (isset($pwdLockoutDuration) and ($pwdLockoutDuration > 0)) {
-                    $lockDate = ldapDate2phpDate($pwdAccountLockedTime);
-                    $unlockDate = date_add( $lockDate, new DateInterval('PT'.$pwdLockoutDuration.'S'));
-                    if ( time() <= $unlockDate->getTimestamp() ) {
-                        $isLocked = true;
-                    }
-                } else {
-                    $isLocked = true;
-                }
-            }
 
             # Expiration
             if(isset($ppolicy_entry[0]['pwdmaxage'][0]))
diff --git a/htdocs/enableaccount.php b/htdocs/enableaccount.php
index 0756186..f2d23a9 100644
--- a/htdocs/enableaccount.php
+++ b/htdocs/enableaccount.php
@@ -6,6 +6,7 @@
 $result = "";
 $dn = "";
 $password = "";
+$comment = "";
 
 if (isset($_POST["dn"]) and $_POST["dn"]) {
     $dn = $_POST["dn"];
@@ -13,6 +14,11 @@
     $result = "dnrequired";
 }
 
+if (isset($_POST["comment"]) and $_POST["comment"]) {
+    $comment = $_POST["comment"];
+}
+
+
 if (!$use_enableaccount) {
     $result = "actionforbidden";
 }
@@ -38,7 +44,7 @@
 }
 
 if ($audit_log_file) {
-    auditlog($audit_log_file, $dn, $audit_admin, "enableaccount", $result);
+    auditlog($audit_log_file, $dn, $audit_admin, "enableaccount", $result, $comment);
 }
 
 header('Location: index.php?page=display&dn='.$dn.'&enableaccountresult='.$result);
diff --git a/lang/fr.inc.php b/lang/fr.inc.php
index 4d0bc13..d404000 100644
--- a/lang/fr.inc.php
+++ b/lang/fr.inc.php
@@ -8,13 +8,13 @@
 $messages['accountdisabled'] = "Le compte est désactivé";
 $messages['auditlogs'] = "Audit";
 $messages['auditlogtitle'] = "Traces d'audit pour les $audit_log_days derniers jours";
-$messages['accountlocked'] = "Le compte est bloqué";
+$messages['accountlocked'] = "Le compte est verrouillé";
 $messages['accountnotdisabled'] = "Échec de la désactivation du compte";
 $messages['accountnotenabled'] = "Échec de l'activation du compte";
-$messages['accountnotlocked'] = "Échec de blocage du compte";
-$messages['accountnotunlocked'] = "Échec de déblocage du compte";
+$messages['accountnotlocked'] = "Échec de verrouillage du compte";
+$messages['accountnotunlocked'] = "Échec de déverrouillage du compte";
 $messages['accountstatus'] = "Statut du compte";
-$messages['accountunlocked'] = "Le compte n'est pas bloqué";
+$messages['accountunlocked'] = "Le compte n'est pas verrouillé";
 $messages['actionforbidden'] = "Action interdite";
 $messages['changesubject'] = "Votre mot de passe a été changé";
 $messages['changesubjectforadmin'] = "Le mot de passe d'un utilisateur a été changé";
@@ -74,7 +74,7 @@
 $messages['label_phone'] = "Téléphone";
 $messages['label_postaladdress'] = "Adresse";
 $messages['label_postalcode'] = "Code postal";
-$messages['label_pwdaccountlockedtime'] = "Date de blocage";
+$messages['label_pwdaccountlockedtime'] = "Date de verrouillage";
 $messages['label_pwdchangedtime'] = "Dernier changement de mot de passe";
 $messages['label_pwdfailuretime'] = "Derniers échecs d'authentification";
 $messages['label_pwdpolicysubentry'] = "Politique des mots de passe associée";
@@ -86,8 +86,8 @@
 $messages['label_title'] = "Titre";
 $messages['label_user_dn'] = "Utilisateur";
 $messages['ldaperror'] = "Erreur de communication avec l'annuaire LDAP";
-$messages['lockaccount'] = "Bloquer le compte";
-$messages['lockedaccounts'] = "Comptes bloqués";
+$messages['lockaccount'] = "Verrouiller le compte";
+$messages['lockedaccounts'] = "Comptes verrouillés";
 $messages['logout'] = "Déconnexion";
 $messages['newpassword'] = "Nouveau mot de passe";
 $messages['noentriesfound'] = "Aucune entrée trouvée";
@@ -110,7 +110,7 @@
 $messages['tooltip_emailto'] = "Envoyer un email";
 $messages['tooltip_phoneto'] = "Composer ce numéro";
 $messages['true'] = "Oui";
-$messages['unlockaccount'] = "Débloquer le compte";
+$messages['unlockaccount'] = "Déverrouiller le compte";
 $messages['unlockdate'] = "Date de déblocage automatique :";
 $messages['welcome'] = "Bienvenue sur le guichet de service LDAP Tool Box";
 $messages['willexpireaccounts'] = "Mots de passe bientôt expirés";