diff --git a/public/less/generics.less b/public/less/generics.less
index 4115f7d117..c21823143e 100644
--- a/public/less/generics.less
+++ b/public/less/generics.less
@@ -55,3 +55,14 @@
 		vertical-align: middle;
 	}
 }
+
+.avatar {
+	/* Contains the user icon class as a mixin, so there's no need to include that in the template */
+	.user-icon;
+
+	&.avatar-sm {
+		width: 24px;
+		height: 24px;
+		.user-icon-style(24px, 1.5rem);
+	}
+}
\ No newline at end of file
diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl
index 747f9e03db..eb43eaa824 100644
--- a/src/views/admin/advanced/events.tpl
+++ b/src/views/admin/advanced/events.tpl
@@ -10,9 +10,16 @@
 				<!-- BEGIN events -->
 				<div>
 					<span>#{events.eid} </span><span class="label label-info">{events.type}</span>
-					<a href="{config.relative_path}/user/{events.user.userslug}" target="_blank"><img class="user-img" src="{events.user.picture}"/></a> <a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{events.user.username}</a> (uid {events.user.uid}) (IP {events.ip})
+					<a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">
+						<!-- IF events.user.picture -->
+						<img class="avatar avatar-sm" src="{events.user.picture}" />
+						<!-- ELSE -->
+						<div class="avatar avatar-sm" style="background-color: {events.user.icon:bgColor};">{events.user.icon:text}</div>
+						<!-- ENDIF events.user.picture -->
+					</a>
+					<a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{events.user.username}</a> (uid {events.user.uid}) (IP {events.ip})
 					<span class="pull-right">{events.timestampISO}</span>
-					<br/><br/>
+					<br /><br />
 					<pre>{events.jsonString}</pre>
 				</div>
 				<!-- END events -->