diff --git a/src/Ombi.Notifications/NotificationMessageCurlys.cs b/src/Ombi.Notifications/NotificationMessageCurlys.cs
index 9dd3cc486..8309ff045 100644
--- a/src/Ombi.Notifications/NotificationMessageCurlys.cs
+++ b/src/Ombi.Notifications/NotificationMessageCurlys.cs
@@ -38,11 +38,11 @@ namespace Ombi.Notifications
             AdditionalInformation = opts?.AdditionalInformation ?? string.Empty;
         }
 
-        public void SetupNewsletter(CustomizationSettings s, string username)
+        public void SetupNewsletter(CustomizationSettings s, OmbiUser username)
         {
             ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
             ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
-            RequestedUser = username;
+            RequestedUser = username.UserName;
         }
 
         public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s)
diff --git a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
index 9f303b906..d3771dce8 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
@@ -115,81 +115,105 @@ namespace Ombi.Schedule.Jobs.Ombi
 
             }
 
-            // Get the users to send it to
-            var users = await _userManager.GetUsersInRoleAsync(OmbiRoles.RecievesNewsletter);
-            if (!users.Any())
+            if (!test)
             {
-                return;
-            }
-            var emailTasks = new List<Task>();
-            foreach (var user in users)
-            {
-                if (user.Email.IsNullOrEmpty())
+                // Get the users to send it to
+                var users = await _userManager.GetUsersInRoleAsync(OmbiRoles.RecievesNewsletter);
+                if (!users.Any())
                 {
-                    continue;
+                    return;
                 }
+                var emailTasks = new List<Task>();
+                foreach (var user in users)
+                {
+                    if (user.Email.IsNullOrEmpty())
+                    {
+                        continue;
+                    }
 
-                var html = LoadTemplate(body, template, customization, user.Alias);
+                    var messageContent = ParseTemplate(template, customization, user);
+                    var email = new NewsletterTemplate();
 
-                emailTasks.Add(_email.Send(new NotificationMessage { Message = html, Subject = template.Subject, To = user.Email }, emailSettings));
-            }
+                    var html = email.LoadTemplate(messageContent.Subject, messageContent.Message, body, customization.Logo);
 
-            // Now add all of this to the Recently Added log
-            var recentlyAddedLog = new HashSet<RecentlyAddedLog>();
-            foreach (var p in plexContentMoviesToSend)
-            {
-                if (p.Type == PlexMediaTypeEntity.Movie)
-                {
-                    recentlyAddedLog.Add(new RecentlyAddedLog
-                    {
-                        AddedAt = DateTime.Now,
-                        Type = RecentlyAddedType.Plex,
-                        ContentId = p.Id
-                    });
+                    emailTasks.Add(_email.Send(
+                        new NotificationMessage {Message = html, Subject = messageContent.Subject, To = user.Email},
+                        emailSettings));
                 }
-                else
+
+                // Now add all of this to the Recently Added log
+                var recentlyAddedLog = new HashSet<RecentlyAddedLog>();
+                foreach (var p in plexContentMoviesToSend)
                 {
-                    // Add the episodes
-                    foreach (var ep in p.Episodes)
+                    if (p.Type == PlexMediaTypeEntity.Movie)
                     {
                         recentlyAddedLog.Add(new RecentlyAddedLog
                         {
                             AddedAt = DateTime.Now,
                             Type = RecentlyAddedType.Plex,
-                            ContentId = ep.Id
+                            ContentId = p.Id
                         });
                     }
-                }
-            }
-
-            foreach (var e in embyContentMoviesToSend)
-            {
-                if (e.Type == EmbyMediaType.Movie)
-                {
-                    recentlyAddedLog.Add(new RecentlyAddedLog
+                    else
                     {
-                        AddedAt = DateTime.Now,
-                        Type = RecentlyAddedType.Emby,
-                        ContentId = e.Id
-                    });
+                        // Add the episodes
+                        foreach (var ep in p.Episodes)
+                        {
+                            recentlyAddedLog.Add(new RecentlyAddedLog
+                            {
+                                AddedAt = DateTime.Now,
+                                Type = RecentlyAddedType.Plex,
+                                ContentId = ep.Id
+                            });
+                        }
+                    }
                 }
-                else
+
+                foreach (var e in embyContentMoviesToSend)
                 {
-                    // Add the episodes
-                    foreach (var ep in e.Episodes)
+                    if (e.Type == EmbyMediaType.Movie)
                     {
                         recentlyAddedLog.Add(new RecentlyAddedLog
                         {
                             AddedAt = DateTime.Now,
-                            Type = RecentlyAddedType.Plex,
-                            ContentId = ep.Id
+                            Type = RecentlyAddedType.Emby,
+                            ContentId = e.Id
                         });
                     }
+                    else
+                    {
+                        // Add the episodes
+                        foreach (var ep in e.Episodes)
+                        {
+                            recentlyAddedLog.Add(new RecentlyAddedLog
+                            {
+                                AddedAt = DateTime.Now,
+                                Type = RecentlyAddedType.Plex,
+                                ContentId = ep.Id
+                            });
+                        }
+                    }
                 }
+                await _recentlyAddedLog.AddRange(recentlyAddedLog);
+
+                await Task.WhenAll(emailTasks.ToArray());
             }
-            await _recentlyAddedLog.AddRange(recentlyAddedLog);
+            else
+            {
+                var admins = await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin);
+                foreach (var a in admins)
+                {
+                    var messageContent = ParseTemplate(template, customization, a);
+
+                    var email = new NewsletterTemplate();
 
-            await Task.WhenAll(emailTasks.ToArray());
+                    var html = email.LoadTemplate(messageContent.Subject, messageContent.Message, body, customization.Logo);
+                    
+                    await _email.Send(
+                        new NotificationMessage { Message = html, Subject = messageContent.Subject, To = a.Email },
+                        emailSettings);
+                }
+            }
         }
 
         public async Task Start()
@@ -198,20 +222,14 @@ namespace Ombi.Schedule.Jobs.Ombi
             await Start(newsletterSettings, false);
         }
 
-        private string LoadTemplate(string body, NotificationTemplates template, CustomizationSettings settings, string username)
+        private NotificationMessageContent ParseTemplate(NotificationTemplates template, CustomizationSettings settings, OmbiUser username)
         {
-            var email = new NewsletterTemplate();
-
             var resolver = new NotificationMessageResolver();
             var curlys = new NotificationMessageCurlys();
 
             curlys.SetupNewsletter(settings, username);
 
-            var parsed = resolver.ParseMessage(template, curlys);
-
-            var html = email.LoadTemplate(parsed.Subject, parsed.Message, body, settings.Logo);
-
-            return html;
+            return resolver.ParseMessage(template, curlys);
         }
 
         private async Task<string> BuildHtml(IQueryable<PlexServerContent> plexContentToSend, IQueryable<EmbyContent> embyContentToSend)
diff --git a/src/Ombi/ClientApp/app/settings/notifications/newsletter.component.ts b/src/Ombi/ClientApp/app/settings/notifications/newsletter.component.ts
index 4e254688e..9c91cab10 100644
--- a/src/Ombi/ClientApp/app/settings/notifications/newsletter.component.ts
+++ b/src/Ombi/ClientApp/app/settings/notifications/newsletter.component.ts
@@ -1,9 +1,10 @@
-import { TesterService } from './../../services/applications/tester.service';
+
 import { Component, OnInit } from "@angular/core";
 
 import { INewsletterNotificationSettings, NotificationType } from "../../interfaces";
 import { NotificationService } from "../../services";
 import { SettingsService } from "../../services";
+import { TesterService } from "./../../services/applications/tester.service";
 
 @Component({
     templateUrl: "./newsletter.component.html",
@@ -28,7 +29,7 @@ export class NewsletterComponent implements OnInit {
     }
 
     public test() {
-        this.testService.testNewsletter(this.settings).subscribe();
+        this.testService.newsletterTest(this.settings).subscribe();
     }
 
     public onSubmit() {