diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index f2217dc7e..20ef3f612 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -62,7 +62,10 @@ namespace PlexRequests.Services.Notification
 
             var emailSettings = (EmailNotificationSettings)settings;
 
-            if (!ValidateConfiguration(emailSettings)) return;
+            if (!ValidateConfiguration(emailSettings))
+            {
+                return;
+            }
 
             switch (model.NotificationType)
             {
@@ -96,15 +99,19 @@ namespace PlexRequests.Services.Notification
 
         private bool ValidateConfiguration(EmailNotificationSettings settings)
         {
-            if (!settings.Enabled)
-            {
-                return false;
-            }
             if (string.IsNullOrEmpty(settings.EmailHost) || string.IsNullOrEmpty(settings.EmailUsername) || string.IsNullOrEmpty(settings.EmailPassword) || string.IsNullOrEmpty(settings.RecipientEmail) || string.IsNullOrEmpty(settings.EmailPort.ToString()))
             {
                 return false;
             }
 
+            if (!settings.EnableUserEmailNotifications)
+            {
+                if (!settings.Enabled)
+                {
+                    return false;
+                }
+            }
+
             return true;
         }