diff --git a/ProjectLighthouse.Localization/BaseLayout.resx b/ProjectLighthouse.Localization/BaseLayout.resx
index 65d1229f..5a44aaea 100644
--- a/ProjectLighthouse.Localization/BaseLayout.resx
+++ b/ProjectLighthouse.Localization/BaseLayout.resx
@@ -93,4 +93,13 @@
     <data name="read_only_warn" xml:space="preserve">
         <value>This instance is currently in read-only mode. Level and photo uploads, comments, reviews, and certain profile changes will be restricted until read-only mode is disabled.</value>
     </data>
+    <data name="email_enforcement_message_main" xml:space="preserve">
+        <value>This instance has email enforcement enabled. If you haven't already, you will need to set and verify an email address to use most features.</value>
+    </data>
+    <data name="email_enforcement_message_no_email" xml:space="preserve">
+        <value>You do not have an email set on your account. You can set an email by opening the text chat and typing "/setemail [youremail@example.com]" (do not include the brackets.)</value>
+    </data>
+    <data name="email_enforcement_message_verify_email" xml:space="preserve">
+        <value>You have set an email address on your account, but you have not verified it. Make sure to check your inbox for a verification email. If you have not recieved an email, please contact an instance administrator for further assistance.</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
index 1ab1830c..877d6be5 100644
--- a/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
@@ -57,7 +57,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.";
 
         UserEntity? user = await this.database.UserFromGameToken(token);
 
-        StringBuilder announceText = new(ServerConfiguration.Instance.AnnounceText);
+        StringBuilder announceText = new(ServerConfiguration.Instance.AnnounceText + "\n\n");
 
         announceText.Replace("%user", user.Username);
         announceText.Replace("%id", token.UserId.ToString());
@@ -69,15 +69,15 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.";
 
         if (EmailEnforcementConfiguration.Instance.EnableEmailEnforcement)
         {
-            announceText.Append(EmailEnforcementConfiguration.Instance.EmailEnforcementMessageMain + "\n\n");
+            announceText.Append(BaseLayoutStrings.EmailEnforcementWarnMain.Translate(LocalizationManager.DefaultLang) + "\n\n");
 
             if (user.EmailAddress == null)
             {
-                announceText.Append(EmailEnforcementConfiguration.Instance.EmailEnforcementMessageNoEmail + "\n\n");
+                announceText.Append(BaseLayoutStrings.EmailEnforcementWarnNoEmail.Translate(LocalizationManager.DefaultLang) + "\n\n");
             }
             else if (!user.EmailAddressVerified)
             {
-                announceText.Append(EmailEnforcementConfiguration.Instance.EmailEnforcementMessageVerify + "\n\n");
+                announceText.Append(BaseLayoutStrings.EmailEnforcementWarnVerifyEmail.Translate(LocalizationManager.DefaultLang) + "\n\n");
             }
         }
 
diff --git a/ProjectLighthouse/Configuration/EmailEnforcementConfiguration.cs b/ProjectLighthouse/Configuration/EmailEnforcementConfiguration.cs
index 9f9e2d9c..c6697df1 100644
--- a/ProjectLighthouse/Configuration/EmailEnforcementConfiguration.cs
+++ b/ProjectLighthouse/Configuration/EmailEnforcementConfiguration.cs
@@ -7,7 +7,7 @@ namespace LBPUnion.ProjectLighthouse.Configuration;
 
 public class EmailEnforcementConfiguration : ConfigurationBase<EmailEnforcementConfiguration>
 {
-    public override int ConfigVersion { get; set; } = 3;
+    public override int ConfigVersion { get; set; } = 4;
 
     public override string ConfigName { get; set; } = "enforce-email.yml";
 
@@ -67,22 +67,6 @@ public class EmailEnforcementConfiguration : ConfigurationBase<EmailEnforcementC
         "update_my_pins",
     };
 
-    public string EmailEnforcementMessageMain { get; set; } = 
-        "This lighthouse instance has email enforcement enabled. " +
-        "If you haven't already, you will need to set and verify " +
-        "an email address to use most features. ";
-
-    public string EmailEnforcementMessageNoEmail { get; set; } = 
-        "You do not have an email set on your account. You can set " +
-        "an email by opening the text chat and typing \"/setemail " +
-        "[youremail@example.com]\" (do not include the brackets.) ";
-
-    public string EmailEnforcementMessageVerify { get; set; } = 
-        "You have set an email address on your account, but you have not " +
-        "verified it. Make sure to check your inbox for a verification email. " +
-        "If you have not received an email, please contact an instance " +
-        "administrator for further assistance. ";
-
     public override ConfigurationBase<EmailEnforcementConfiguration> Deserialize
         (IDeserializer deserializer, string text) =>
         deserializer.Deserialize<EmailEnforcementConfiguration>(text);