diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index bbab14e5..516f9adf 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -6,7 +6,7 @@
 
 /**
  * Update user.
- * 
+ *
  * @param User $user          
  */
 function User_update($user) {
@@ -243,7 +243,7 @@ function User_generate_password_recovery_token(&$user) {
   $result = sql_query("UPDATE `User` SET `password_recovery_token`='" . sql_escape($user['password_recovery_token']) . "' WHERE `UID`='" . sql_escape($user['UID']) . "' LIMIT 1");
   if ($result === false)
     return false;
-  engelsystem_log("Password recovery for " . $user['Nick'] . " started.");
+  engelsystem_log("Password recovery for " . User_Nick_render($user) . " started.");
   return $user['password_recovery_token'];
 }
 
diff --git a/includes/sys_log.php b/includes/sys_log.php
index 60c765c0..cf489ffa 100644
--- a/includes/sys_log.php
+++ b/includes/sys_log.php
@@ -9,13 +9,13 @@
  */
 function engelsystem_log($message) {
   global $user;
-
+  
   if (isset($user)) {
-    $nick = $user['Nick'];
+    $nick = User_Nick_render($user);
   } else {
     $nick = "Guest";
   }
-
+  
   LogEntry_create($nick, $message);
 }
 
@@ -27,14 +27,14 @@ function debug_string_backtrace() {
   debug_print_backtrace();
   $trace = ob_get_contents();
   ob_end_clean();
-
+  
   // Remove first item from backtrace as it's this function which
   // is redundant.
   $trace = preg_replace('/^#0\s+' . __FUNCTION__ . "[^\n]*\n/", '', $trace, 1);
-
+  
   // Renumber backtrace items.
   $trace = preg_replace('/^#(\d+)/me', '\'#\' . ($1 - 1)', $trace);
-
+  
   return $trace;
 }