diff --git a/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml.cs
index 6d96390f..eb2109b6 100644
--- a/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml.cs
@@ -46,7 +46,7 @@ public class PasswordResetRequestForm : BaseLayout
 
         if (user == null)
         {
-            this.Status = $"A password reset request has been sent to the email {email}.\n" +
+            this.Status = $"A password reset request has been sent to the email {email}. " +
                           "If you do not receive an email verify that you have entered the correct email address";
             return this.Page();
         }
@@ -68,7 +68,7 @@ public class PasswordResetRequestForm : BaseLayout
         this.Database.PasswordResetTokens.Add(token);
         await this.Database.SaveChangesAsync();
 
-        this.Status = $"A password reset request has been sent to the email {email}." +
+        this.Status = $"A password reset request has been sent to the email {email}. " +
                       "If you do not receive an email verify that you have entered the correct email address";
         return this.Page();
     }
diff --git a/ProjectLighthouse/Configuration/ConfigurationCategories/MailConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/MailConfiguration.cs
index 9bef477b..8fa4c153 100644
--- a/ProjectLighthouse/Configuration/ConfigurationCategories/MailConfiguration.cs
+++ b/ProjectLighthouse/Configuration/ConfigurationCategories/MailConfiguration.cs
@@ -12,6 +12,8 @@ public class MailConfiguration
 
     public string FromName { get; set; } = "Project Lighthouse";
 
+    public string Username { get; set; } = "";
+
     public string Password { get; set; } = "";
 
     public bool UseSSL { get; set; } = true;
diff --git a/ProjectLighthouse/Configuration/ServerConfiguration.cs b/ProjectLighthouse/Configuration/ServerConfiguration.cs
index 04a54bf9..0f19f1c2 100644
--- a/ProjectLighthouse/Configuration/ServerConfiguration.cs
+++ b/ProjectLighthouse/Configuration/ServerConfiguration.cs
@@ -23,7 +23,7 @@ public class ServerConfiguration
     // You can use an ObsoleteAttribute instead. Make sure you set it to error, though.
     //
     // Thanks for listening~
-    public const int CurrentConfigVersion = 12;
+    public const int CurrentConfigVersion = 13;
 
     #region Meta
 
diff --git a/ProjectLighthouse/Helpers/SMTPHelper.cs b/ProjectLighthouse/Helpers/SMTPHelper.cs
index 3a72db02..f0404fe5 100644
--- a/ProjectLighthouse/Helpers/SMTPHelper.cs
+++ b/ProjectLighthouse/Helpers/SMTPHelper.cs
@@ -17,7 +17,7 @@ public static class SMTPHelper
         client = new SmtpClient(ServerConfiguration.Instance.Mail.Host, ServerConfiguration.Instance.Mail.Port)
         {
             EnableSsl = ServerConfiguration.Instance.Mail.UseSSL,
-            Credentials = new NetworkCredential(ServerConfiguration.Instance.Mail.FromAddress, ServerConfiguration.Instance.Mail.Password),
+            Credentials = new NetworkCredential(ServerConfiguration.Instance.Mail.Username, ServerConfiguration.Instance.Mail.Password),
         };
 
         fromAddress = new MailAddress(ServerConfiguration.Instance.Mail.FromAddress, ServerConfiguration.Instance.Mail.FromName);