diff --git a/src/js/index.js b/src/js/index.js
index 325655cd0..a31ea6988 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -373,6 +373,8 @@ 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_APP_TASK_CRASH = 'app.task.crash';
+
 var ACTION_BACKUP_FINISH = 'backup.finish';
 var ACTION_BACKUP_START = 'backup.start';
 var ACTION_BACKUP_CLEANUP_START = 'backup.cleanup.start';
@@ -400,6 +402,8 @@ var ACTION_MAIL_LIST_REMOVE = 'mail.list.remove';
 
 var ACTION_DYNDNS_UPDATE = 'dyndns.update';
 
+var ACTION_SYSTEM_CRASH = 'system.crash';
+
 app.filter('eventLogSource', function() {
     return function(eventLog) {
         var source = eventLog.source;
@@ -476,6 +480,9 @@ app.filter('eventLogDetails', function() {
         case ACTION_APP_DOWN:
             return source.app.manifest.title + ' is not reachable';
 
+        case ACTION_APP_TASK_CRASH:
+            return 'Apptask for app with id ' + source.appId + ' crashed';
+
         case ACTION_BACKUP_START:
             return 'Backup started';
 
@@ -545,6 +552,9 @@ app.filter('eventLogDetails', function() {
         case ACTION_DYNDNS_UPDATE:
             return 'DNS was updated from ' + data.fromIp + ' to ' + data.toIp;
 
+        case ACTION_SYSTEM_CRASH:
+            return 'A system process crashed';
+
         default: return eventLog.action;
         }
     };
diff --git a/src/views/activity.js b/src/views/activity.js
index 39a02681a..ca3a17041 100644
--- a/src/views/activity.js
+++ b/src/views/activity.js
@@ -20,6 +20,7 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
         { name: 'app.update', value: 'app.update' },
         { name: 'app.login', value: 'app.login' },
         { name: 'app.oom', value: 'app.oom' },
+        { name: 'Apptask Crash', value: 'app.task.crash' },
         { name: 'backup.cleanup', value: 'backup.cleanup.start' },
         { name: 'backup.cleanup.finish', value: 'backup.cleanup.finish' },
         { name: 'backup.finish', value: 'backup.finish' },
@@ -44,7 +45,8 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
         { name: 'user.login', value: 'user.login' },
         { name: 'user.remove', value: 'user.remove' },
         { name: 'user.transfer', value: 'user.transfer' },
-        { name: 'user.update', value: 'user.update' }
+        { name: 'user.update', value: 'user.update' },
+        { name: 'System Crash', value: 'system.crash' }
     ];
 
     $scope.pageItemCount = [