diff --git a/settings/js/log.js b/settings/js/log.js
index 43ef561f7ee..a1ad29d72e7 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -64,6 +64,11 @@ OC.Log = {
 				timeTd.text(formatDate(entry.time * 1000));
 			}
 			row.append(timeTd);
+
+			var userTd = $('<td/>');
+			userTd.text(entry.user);
+			row.append(userTd);
+
 			$('#log').append(row);
 		}
 		OC.Log.loaded += entries.length;
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 0cdefe10083..b5c5b2510b6 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -519,6 +519,7 @@ if ($_['cronErrors']) {
 					p($entry->time);
 				}?>
 			</td>
+			<td><?php isset($entry->user) ? p($entry->user) : p('--') ?></td>
 		</tr>
 		<?php endforeach;?>
 	</table>