diff --git a/src/MineOnlineBroadcast.java b/src/MineOnlineBroadcast.java
index 54a46c0..4257241 100644
--- a/src/MineOnlineBroadcast.java
+++ b/src/MineOnlineBroadcast.java
@@ -225,7 +225,7 @@ public class MineOnlineBroadcast extends Plugin {
         MinecraftColorCodeProvider colorCodeProvider = new MinecraftColorCodeProvider();
 
         mineOnlineConfig = new MineOnlineConfig(new File("." + File.separator + "plugins" + File.separator + "MineOnlineBroadcast" + File.separator + "config.properties"));
-        
+
         Properties propertiesFile = new Properties();
 
         try {
@@ -240,10 +240,10 @@ public class MineOnlineBroadcast extends Plugin {
 
         try {
             propertiesFile.load(new FileInputStream(new File("server.properties")));
-            String discordToken = propertiesFile.getProperty("discord-token", null);
-            String discordChannelID = propertiesFile.getProperty("discord-channel", null);
-            String discordWebhookURL = propertiesFile.getProperty("discord-webhook-url", null);
-            serverName = propertiesFile.getProperty("server-name", serverName);
+            String discordToken = mineOnlineConfig.getConfigString("discord-token");
+            String discordChannelID = mineOnlineConfig.getConfigString("discord-channel");
+            String discordWebhookURL = mineOnlineConfig.getConfigString("discord-webhook-url");
+            serverName = mineOnlineConfig.getConfigString("server-name");
 
 
             if (discordToken != null && discordChannelID != null) { // Create the discord bot if token and channel are present
diff --git a/src/MineOnlineConfig.java b/src/MineOnlineConfig.java
index 82bd7b2..258e8b7 100644
--- a/src/MineOnlineConfig.java
+++ b/src/MineOnlineConfig.java
@@ -27,6 +27,11 @@ public class MineOnlineConfig {
         generateConfigOption("whitelist", false);
         generateConfigOption("dont-list-players", false);
         generateConfigOption("serverlist-motd", null);
+        //Discord
+        generateConfigOption("discord-token", null);
+        generateConfigOption("discord-channel", null);
+        generateConfigOption("discord-webhook-url", null);
+
     }
 
     //Getters Start
@@ -35,6 +40,15 @@ public class MineOnlineConfig {
     }
 
     public String getConfigString(String key) {
+        if(getConfigOption(key) == null) {
+            return null;
+        }
+        //Hacky solution for hmod config storing null as text
+        if(String.valueOf(getConfigOption(key)).equalsIgnoreCase("null")) {
+            return null;
+        }
+
+
         return String.valueOf(getConfigOption(key));
     }
 
diff --git a/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java b/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java
index 1f462e8..9e38734 100644
--- a/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java
+++ b/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java
@@ -218,10 +218,10 @@ public class MineOnlineBroadcastPlugin extends JavaPlugin {
 
         try {
             propertiesFile.load(new FileInputStream(new File("server.properties")));
-            String discordToken = propertiesFile.getProperty("discord-token", null);
-            String discordChannelID = propertiesFile.getProperty("discord-channel", null);
-            String discordWebhookURL = propertiesFile.getProperty("discord-webhook-url", null);
-            String serverName = propertiesFile.getProperty("server-name", "Minecraft Server");
+            String discordToken = mineOnlineConfig.getConfigString("discord-token");
+            String discordChannelID = mineOnlineConfig.getConfigString("discord-channel");
+            String discordWebhookURL = mineOnlineConfig.getConfigString("discord-webhook-url");
+            String serverName = mineOnlineConfig.getConfigString("server-name");
 
 
             if (discordToken != null && discordChannelID != null) { // Create the discord bot if token and channel are present
diff --git a/src/gg/codie/mineonline/plugin/bukkit/MineOnlineConfig.java b/src/gg/codie/mineonline/plugin/bukkit/MineOnlineConfig.java
index 2e561c5..4f1fef0 100644
--- a/src/gg/codie/mineonline/plugin/bukkit/MineOnlineConfig.java
+++ b/src/gg/codie/mineonline/plugin/bukkit/MineOnlineConfig.java
@@ -26,7 +26,10 @@ public class MineOnlineConfig extends Configuration {
         generateConfigOption("whitelist", false);
         generateConfigOption("dont-list-players", false);
         generateConfigOption("serverlist-motd", null);
-
+        //Discord
+        generateConfigOption("discord-token", null);
+        generateConfigOption("discord-channel", null);
+        generateConfigOption("discord-webhook-url", null);
     }
 
     private void generateConfigOption(String key, Object defaultValue) {