diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
index 9e27d301..acb953db 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
@@ -1,9 +1,11 @@
 package com.github.games647.fastlogin.bukkit;
 
 import com.github.games647.fastlogin.core.FastLoginCore;
+import com.google.common.base.Charsets;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.io.File;
+import java.io.InputStreamReader;
 import java.util.concurrent.ThreadFactory;
 import java.util.logging.Logger;
 
@@ -44,6 +46,11 @@ public class BukkitCore extends FastLoginCore {
 
         File messageFile = new File(plugin.getDataFolder(), "messages.yml");
         YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile);
+
+        InputStreamReader defaultReader = new InputStreamReader(plugin.getResource("messages.yml"), Charsets.UTF_8);
+        YamlConfiguration defaults = YamlConfiguration.loadConfiguration(defaultReader);
+        messageConfig.setDefaults(defaults);
+
         for (String key : messageConfig.getKeys(false)) {
             String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
             if (!message.isEmpty()) {
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
index 40692e56..22cb69ad 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
@@ -49,9 +49,13 @@ public class BungeeCore extends FastLoginCore {
     public void loadMessages() {
         try {
             saveDefaultFile("messages.yml");
-            
+
+            Configuration defaults = ConfigurationProvider.getProvider(YamlConfiguration.class)
+                    .load(getClass().getResourceAsStream("/messages.yml"));
+
             File messageFile = new File(getDataFolder(), "messages.yml");
-            Configuration messageConfig = ConfigurationProvider.getProvider(YamlConfiguration.class).load(messageFile);
+            Configuration messageConfig = ConfigurationProvider.getProvider(YamlConfiguration.class)
+                    .load(messageFile, defaults);
             for (String key : messageConfig.getKeys()) {
                 String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
                 if (!message.isEmpty()) {