diff --git a/webadmin/src/js/index.js b/webadmin/src/js/index.js
index c81a1950e..d08c6d5a6 100644
--- a/webadmin/src/js/index.js
+++ b/webadmin/src/js/index.js
@@ -311,14 +311,18 @@ app.filter('eventLogDetails', function() {
         var data = eventLog.data;
         var errorMessage = data.errorMessage;
 
+        function shortenId(id) {
+            return id.slice(0, 8) + '...';
+        }
+
         switch (eventLog.action) {
         case ACTION_ACTIVATE: return 'Cloudron activated';
-        case ACTION_APP_CONFIGURE: return 'App ' + data.appId + ' was configured';
-        case ACTION_APP_INSTALL: return 'App ' + data.manifest.id + '@' + data.manifest.version + ' installed at ' + data.location + ' with id ' + data.appId;
-        case ACTION_APP_RESTORE: return 'App ' + data.appId + ' restored';
-        case ACTION_APP_UNINSTALL: return 'App ' + data.appId + ' uninstalled';
-        case ACTION_APP_UPDATE: return 'App ' + data.appId + ' updated to version ' + data.toManifest.id + '@' + data.toManifest.version;
-        case ACTION_APP_LOGIN: return 'App ' + data.appId + ' logged in';
+        case ACTION_APP_CONFIGURE: return 'App ' + shortenId(data.appId) + ' was configured';
+        case ACTION_APP_INSTALL: return 'App ' + data.manifest.id + '@' + data.manifest.version + ' installed at ' + data.location + '.' + data.domain + ' with id ' + shortenId(data.appId);
+        case ACTION_APP_RESTORE: return 'App ' + shortenId(data.appId) + ' restored';
+        case ACTION_APP_UNINSTALL: return 'App ' + shortenId(data.appId) + '  uninstalled';
+        case ACTION_APP_UPDATE: return 'App ' + shortenId(data.appId) + ' updated to version ' + data.toManifest.id + '@' + data.toManifest.version;
+        case ACTION_APP_LOGIN: return 'App ' + shortenId(data.appId) + ' logged in';
         case ACTION_BACKUP_START: return 'Backup started';
         case ACTION_BACKUP_FINISH: return 'Backup finished. ' + (errorMessage ? ('error: ' + errorMessage) : ('id: ' + data.filename));
         case ACTION_BACKUP_CLEANUP: return 'Backup ' + data.backup.id + ' removed';
diff --git a/webadmin/src/views/activity.html b/webadmin/src/views/activity.html
index f5dcbb65a..2424fe012 100644
--- a/webadmin/src/views/activity.html
+++ b/webadmin/src/views/activity.html
@@ -38,7 +38,7 @@
                 <tr ng-repeat="eventLog in eventLogs">
                   <td><span uib-tooltip="{{eventLog.creationTime}}" class="arrow">{{ eventLog.creationTime | prettyDate }}</span></td>
                   <td>{{ eventLog.source.username || eventLog.source.userId || eventLog.source.authType }} <span ng-show="eventLog.source.ip || eventLog.source.appId"> ({{ eventLog.source.ip || eventLog.source.appId }}) </span> </td>
-                  <td>{{ eventLog | eventLogDetails }}</td>
+                  <td ng-bind-html="eventLog | eventLogDetails"></td>
                 </tr>
               </tbody>
             </table>