diff --git a/src/js/index.js b/src/js/index.js
index 04e03d640..ac9d9ffbd 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -539,6 +539,7 @@ var ACTION_APP_INSTALL = 'app.install';
 var ACTION_APP_RESTORE = 'app.restore';
 var ACTION_APP_UNINSTALL = 'app.uninstall';
 var ACTION_APP_UPDATE = 'app.update';
+var ACTION_APP_UPDATE_FINISH = 'app.update.finish';
 var ACTION_APP_LOGIN = 'app.login';
 var ACTION_APP_OOM = 'app.oom';
 var ACTION_APP_UP = 'app.up';
@@ -559,6 +560,7 @@ var ACTION_DOMAIN_REMOVE = 'domain.remove';
 
 var ACTION_START = 'cloudron.start';
 var ACTION_UPDATE = 'cloudron.update';
+var ACTION_UPDATE_FINISH = 'cloudron.update.finish';
 var ACTION_USER_ADD = 'user.add';
 var ACTION_USER_LOGIN = 'user.login';
 var ACTION_USER_REMOVE = 'user.remove';
@@ -695,7 +697,11 @@ app.filter('eventLogDetails', function() {
 
         case ACTION_APP_UPDATE:
             if (!data.app) return '';
-            return data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' was updated from v' + data.fromManifest.version + ' to v' + data.toManifest.version;
+            return 'Update of ' + data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' started from v' + data.fromManifest.version + ' to v' + data.toManifest.version;
+
+        case ACTION_APP_UPDATE_FINISH:
+            if (!data.app) return '';
+            return data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' was updated to v' + data.app.manifest.version;
 
         case ACTION_APP_CLONE:
             return data.newApp.manifest.title + ' at ' + (data.newApp.fqdn || data.newApp.location) + ' was cloned from ' + (data.oldApp.fqdn || data.oldApp.location) + ' using backup ' + data.backupId + ' with v' + data.oldApp.manifest.version;
@@ -768,7 +774,10 @@ app.filter('eventLogDetails', function() {
             return 'Cloudron started with version ' + data.version;
 
         case ACTION_UPDATE:
-            return 'Cloudron was updated to version ' + data.boxUpdateInfo.version;
+            return 'Cloudron update to version ' + data.boxUpdateInfo.version + ' was started';
+
+        case ACTION_UPDATE_FINISH:
+                return 'Cloudron updated to version ' + data.newVersion;
 
         case ACTION_USER_ADD:
             return data.email + (data.user.username ? ' (' + data.user.username + ')' : '') + ' was added';
@@ -807,7 +816,8 @@ app.filter('eventLogAction', function() {
         case ACTION_APP_INSTALL: return 'App installed';
         case ACTION_APP_RESTORE: return 'App restored';
         case ACTION_APP_UNINSTALL: return 'App  uninstalled';
-        case ACTION_APP_UPDATE: return 'App updated';
+        case ACTION_APP_UPDATE: return 'App update started';
+        case ACTION_APP_UPDATE_FINISH: return 'App updated';
         case ACTION_APP_CLONE: return 'App cloned';
         case ACTION_APP_LOGIN: return 'App login';
         case ACTION_BACKUP_START: return 'Backup started';
@@ -827,7 +837,8 @@ app.filter('eventLogAction', function() {
         case ACTION_MAIL_LIST_ADD: return 'Mail list added';
         case ACTION_MAIL_LIST_REMOVE: return 'Mail list removed';
         case ACTION_START: return 'Cloudron started';
-        case ACTION_UPDATE: return 'Cloudron updated';
+        case ACTION_UPDATE: return 'Cloudron update started';
+        case ACTION_UPDATE_FINISH: return 'Cloudron updated';
         case ACTION_USER_ADD: return 'User added';
         case ACTION_USER_LOGIN: return 'User login';
         case ACTION_USER_REMOVE: return 'User removed';