diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index db996dab..31670bfb 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -417,10 +417,14 @@ namespace SparkleShare {
                         comments += "</table>";
                     }
 
+                    string avatar_email = "";
+                    if (File.Exists (GetAvatar (change_set.UserEmail, 36)))
+                        avatar_email = change_set.UserEmail;
+
                     event_entry   += "</dl>";
                     event_entries += event_entry_html.Replace ("<!-- $event-entry-content -->", event_entry)
                         .Replace ("<!-- $event-user-name -->", change_set.UserName)
-                        .Replace ("<!-- $event-avatar-url -->", "file://" + GetAvatar (change_set.UserEmail, 36))
+                        .Replace ("<!-- $event-avatar-url -->", "file://" + GetAvatar (avatar_email, 36))
                         .Replace ("<!-- $event-time -->", change_set.Timestamp.ToString ("H:mm"))
                         .Replace ("<!-- $event-folder -->", change_set.Folder)
                         .Replace ("<!-- $event-revision -->", change_set.Revision)
diff --git a/data/html/event-log.html b/data/html/event-log.html
index f45bf134..456387e8 100644
--- a/data/html/event-log.html
+++ b/data/html/event-log.html
@@ -13,6 +13,12 @@
                 }
               });
 
+              $('.buddy-icon').each (function () {
+                if ($(this).css('backgroundImage').indexOf ('@') != -1) {
+                  $(this).css ('backgroundColor', '#fff');
+                }
+              });
+
               $('.comments-section').click(function () {
                  $(this).find ('.comments-wrapper').show ();
                  $(this).find ('.comments-wrapper').css ('cursor', 'default');