diff --git a/include/class_session.inc b/include/class_session.inc
index 5bca5449b8d0a256f55d32dba0065ed6096e599e..36f7271353364ead85d3e9569b353dafb063ba54 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -190,26 +190,17 @@ class session
         logging::log(
           'security',
           'logout',
-          $ui->dn,
+          $ui->uid,
           [],
-          sprintf(
-            '%s (%s) logged out (%s)',
-            $ui->uid,
-            ($_SERVER['REMOTE_ADDR'] ?? 'Unknown IP'),
-            $reason
-          )
+          sprintf('Logged out (%s)', $reason)
         );
       } elseif (!empty($reason)) {
         logging::log(
           'security',
           'session',
-          ($_SERVER['REMOTE_ADDR'] ?? ''),
+          '',
           [],
-          sprintf(
-            'Session for %s destroyed (%s)',
-            ($_SERVER['REMOTE_ADDR'] ?? 'unknown'),
-            $reason
-          )
+          sprintf('Session destroyed (%s)', $reason)
         );
       }
     } catch (Exception $e) {
diff --git a/include/login/class_LoginMethod.inc b/include/login/class_LoginMethod.inc
index 0c05bb64fbdd75dd993d93a245dd2892c0df86fc..ac07f9d3ee61fb63b7f570e4795e3b8cfc7f9d66 100644
--- a/include/login/class_LoginMethod.inc
+++ b/include/login/class_LoginMethod.inc
@@ -100,7 +100,7 @@ class LoginMethod
     } catch (LoginFailureException $e) {
       /* Load plist to be able to log */
       pluglist::load();
-      logging::log('security', 'login failure', static::$username, [], 'Authentication failed for user "'.static::$username.'": '.$e->getMessage());
+      logging::log('security', 'login failure', static::$username, [], 'Authentication failed: '.$e->getMessage());
       /* Show the same message whether the user exists or not to avoid information leak */
       $message = $e->getMessage();
       $smarty->assign('focusfield', 'password');
@@ -151,10 +151,7 @@ class LoginMethod
     global $config, $ui;
 
     /* Not account expired or password forced change go to main page */
-    logging::log(
-      'security', 'login', $ui->dn, [],
-      sprintf('User "%s" logged in successfully (from %s).', static::$username, ($_SERVER['REMOTE_ADDR'] ?? 'Unknown IP'))
-    );
+    logging::log('security', 'login', static::$username, [], 'Logged in successfully');
     session::set('connected', 1);
     session::set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
     header('Location: main.php');