diff --git a/src/main/java/net/doubledoordev/d3core/util/CommandSetLoginMessage.java b/src/main/java/net/doubledoordev/d3core/util/CommandSetLoginMessage.java
index 98a955a..90f8565 100644
--- a/src/main/java/net/doubledoordev/d3core/util/CommandSetLoginMessage.java
+++ b/src/main/java/net/doubledoordev/d3core/util/CommandSetLoginMessage.java
@@ -1,9 +1,12 @@
 package net.doubledoordev.d3core.util;
 
+import com.google.gson.JsonParseException;
 import net.doubledoordev.d3core.D3Core;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -33,18 +36,28 @@ public void processCommand(ICommandSender sender, String[] args)
         {
             File file = new File(D3Core.getFolder(), "loginmessage.txt");
             if (file.exists()) file.delete();
+            sender.addChatMessage(new ChatComponentTranslation("d3.core.cmd.setloginmessage.removed"));
         }
         else
         {
+            String txt = func_82360_a(sender, args, 0);
             try
             {
-                FileUtils.writeStringToFile(new File(D3Core.getFolder(), "loginmessage.txt"), func_82360_a(sender, args, 0));
+                FileUtils.writeStringToFile(new File(D3Core.getFolder(), "loginmessage.txt"), txt);
             }
             catch (IOException e)
             {
                 throw new RuntimeException(e);
             }
+            sender.addChatMessage(new ChatComponentTranslation("d3.core.cmd.setloginmessage.success"));
+            try
+            {
+                sender.addChatMessage(IChatComponent.Serializer.func_150699_a(txt));
+            }
+            catch (JsonParseException jsonparseexception)
+            {
+                sender.addChatMessage(new ChatComponentText(txt));
+            }
         }
-        sender.addChatMessage(new ChatComponentTranslation("d3.core.cmd.setloginmessage.success"));
     }
 }
diff --git a/src/main/resources/assets/D3Core/lang/en_US.lang b/src/main/resources/assets/D3Core/lang/en_US.lang
index 3b6ab04..61b41bf 100644
--- a/src/main/resources/assets/D3Core/lang/en_US.lang
+++ b/src/main/resources/assets/D3Core/lang/en_US.lang
@@ -47,4 +47,5 @@ commands.d3group.help.node.remove=/d3group node <group> remove <permission node>
 commands.d3group.help.parent.set=/d3group parent <group> set <parent group>
 commands.d3group.help.parent.clear=/d3group parent <group> clear
 
-d3.core.cmd.setloginmessage.success=Set login message!
\ No newline at end of file
+d3.core.cmd.setloginmessage.success=Set login message!
+d3.core.cmd.setloginmessage.removed=Removed login message!