diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
index 04ebe920..777bb912 100644
--- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
@@ -130,7 +130,7 @@ namespace Oqtane.Infrastructure
                                 mailMessage.Subject = notification.Subject;
 
                                 //body
-                                mailMessage.Body = notification.Body;
+                                mailMessage.Body = notification.Body.Replace("\n", "<br />");
 
                                 // encoding
                                 mailMessage.SubjectEncoding = System.Text.Encoding.UTF8;
diff --git a/Oqtane.Server/Managers/UserManager.cs b/Oqtane.Server/Managers/UserManager.cs
index bd7a89c6..07304679 100644
--- a/Oqtane.Server/Managers/UserManager.cs
+++ b/Oqtane.Server/Managers/UserManager.cs
@@ -143,7 +143,7 @@ namespace Oqtane.Managers
                 else
                 {
                     string url = alias.Protocol + alias.Name;
-                    string body = "Dear " + user.DisplayName + ",\n\nA User Account Has Been Successfully Created For You. Please Use The Following Link To Access The Site:\n\n" + url + "\n\nThank You!";
+                    string body = "Dear " + user.DisplayName + ",\n\nA User Account Has Been Successfully Created For You With The Username " + user.Username + ". Please Visit " + url + " And Use The Login Option To Sign In. If You Do Not Know Your Password, Use The Forgot Password Option On The Login Page To Reset Your Account.\n\nThank You!";
                     var notification = new Notification(user.SiteId, User, "User Account Notification", body);
                     _notifications.AddNotification(notification);
                 }