diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index 0b046728..2c02c812 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -859,7 +859,7 @@ namespace Remotely.Server.Services
             catch { }
         }
 
-        public void WriteEvent(Exception ex, string organizationID = null)
+        public void WriteEvent(Exception ex, string organizationID)
         {
             try
             {
diff --git a/Server/Services/EmailSender.cs b/Server/Services/EmailSender.cs
index 7eacd98a..c3b59314 100644
--- a/Server/Services/EmailSender.cs
+++ b/Server/Services/EmailSender.cs
@@ -48,6 +48,7 @@ namespace Remotely.Server.Services
                 mailMessage.Body = htmlMessage;
                 mailMessage.ReplyToList.Add(new MailAddress(replyTo));
                 mailClient.Send(mailMessage);
+                DataService.WriteEvent($"Email successfully sent to {email}.  Subject: \"{subject}\".", organizationID);
                 return Task.FromResult(true);
             }
             catch (Exception ex)
diff --git a/Server/Services/RemoteControlSessionRecorder.cs b/Server/Services/RemoteControlSessionRecorder.cs
index 2e2a07cc..13a6f572 100644
--- a/Server/Services/RemoteControlSessionRecorder.cs
+++ b/Server/Services/RemoteControlSessionRecorder.cs
@@ -92,7 +92,7 @@ namespace Remotely.Server.Services
             }
             catch (Exception ex)
             {
-                DataService.WriteEvent(ex);
+                DataService.WriteEvent(ex, null);
             }
         }
 
diff --git a/Server/Startup.cs b/Server/Startup.cs
index 41869fa9..fe4951c6 100644
--- a/Server/Startup.cs
+++ b/Server/Startup.cs
@@ -253,7 +253,7 @@ namespace Remotely.Server
             }
             catch (Exception ex)
             {
-                dataService.WriteEvent(ex);
+                dataService.WriteEvent(ex, null);
             }
             dataService.SetAllDevicesNotOnline();
             dataService.CleanupOldRecords();