diff --git a/src/js/index.js b/src/js/index.js
index 43f637a8f..e97cf3385 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -371,6 +371,8 @@ var ACTION_APP_RESTORE = 'app.restore';
 var ACTION_APP_UNINSTALL = 'app.uninstall';
 var ACTION_APP_UPDATE = 'app.update';
 var ACTION_APP_LOGIN = 'app.login';
+var ACTION_APP_OOM = 'app.oom';
+var ACTION_APP_DOWN = 'app.down';
 var ACTION_BACKUP_FINISH = 'backup.finish';
 var ACTION_BACKUP_START = 'backup.start';
 var ACTION_BACKUP_CLEANUP_START = 'backup.cleanup.start';
@@ -403,13 +405,17 @@ app.filter('eventLogSource', function() {
         var source = eventLog.source;
         var data = eventLog.data;
         var errorMessage = data.errorMessage;
+        var line = '';
 
         // <span ng-show="eventLog.source.ip || eventLog.source.appId"> ({{ eventLog.source.ip || eventLog.source.appId }}) </span>
-        var line = source.username || source.userId || source.authType || 'system';
 
-        if (source.app) line += ' - ' + source.app.fqdn;
-        else if (source.ip) line += ' - ' + source.ip;
-        else if (source.appId) line += ' - ' + source.appId;
+        if (source.app) {
+            line = (source.app.fqdn || (source.app.location + '.' + source.app.domain));
+        } else {
+            line = source.username || source.userId || source.authType || 'system';
+            if (source.ip) line += ' - ' + source.ip;
+            if (source.appId) line += ' - ' + source.appId;
+        }
 
         return line;
     };
@@ -464,6 +470,12 @@ app.filter('eventLogDetails', function() {
         case ACTION_APP_LOGIN:
             return 'App ' + data.appId + ' logged in';
 
+        case ACTION_APP_OOM:
+            return source.app.manifest.title + ' ran out of memory';
+
+        case ACTION_APP_DOWN:
+            return 'App ' + data.appId + ' is not reachable';
+
         case ACTION_BACKUP_START:
             return 'Backup started';