diff --git a/webadmin/src/js/index.js b/webadmin/src/js/index.js
index 4b3c14fb8..b063cdc39 100644
--- a/webadmin/src/js/index.js
+++ b/webadmin/src/js/index.js
@@ -325,10 +325,10 @@ app.filter('eventLogDetails', function() {
             case ACTION_CERTIFICATE_RENEWAL: return 'Certificate renewal for ' + data.domain + (errorMessage ? ' failed' : ' succeeded');
             case ACTION_START: return 'Cloudron started with version ' + data.version;
             case ACTION_UPDATE: return 'Updating to version ' + data.boxUpdateInfo.version;
-            case ACTION_USER_ADD: return 'User ' + data.email + ' added with id ' + data.userId;
-            case ACTION_USER_LOGIN: return 'User ' + data.userId + ' logged in';
-            case ACTION_USER_REMOVE: return 'User ' + data.userId + ' removed';
-            case ACTION_USER_UPDATE: return 'User ' + data.userId + ' updated';
+            case ACTION_USER_ADD: return data.email + (data.user.username ? ' as <b>' + data.user.username + '</b>' : '');
+            case ACTION_USER_UPDATE:
+            case ACTION_USER_REMOVE:
+            case ACTION_USER_LOGIN: return data.user ? (data.user.email + (data.user.username ? ' as <b>' + data.user.username + '</b>' : '')) : data.userId;
             default: return eventLog.action;
         }
     };