diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java
index 4d9890c..951aea8 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java
@@ -15,7 +15,19 @@ public class Command_myadmin extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         final UUID uuid = sender_p.getUniqueId(); // Get the sender's uuid as a variable.
-        if (args.length >= 2) {
+        if(args.length == 1) {
+         if ("clearloginmsg".equalsIgnoreCase(args[0])) {
+                    playerMsg(ChatColor.GRAY + "Cleared your custom login message."); // Notify player that the login message has been set.
+
+                    AdminList.getEntry(uuid).setCustomLoginMessage(""); // Set the custom login message to the value.
+                    AdminList.save(AdminList.getEntry(uuid)); // Save the modified value to the super admin configuration.
+
+                    AdminList.updateIndexLists(); // Update and refresh configuration.
+                    return true;
+                } else {
+                    return false;
+         }
+        } else if (args.length >= 2) {
             if ("setlogin".equalsIgnoreCase(args[0])) {
                 final String inputMessage = StringUtils.join(args, " ", 1, args.length); // Parse the input provided.
 
@@ -26,15 +38,7 @@ public class Command_myadmin extends FreedomCommand {
 
                 AdminList.updateIndexLists(); // Update and refresh configuration.
                 return true;
-            } else if ("clearloginmsg".equalsIgnoreCase(args[0])) {
-                    playerMsg(ChatColor.GRAY + "Cleared your custom login message."); // Notify player that the login message has been set.
-
-                    AdminList.getEntry(uuid).setCustomLoginMessage(""); // Set the custom login message to the value.
-                    AdminList.save(AdminList.getEntry(uuid)); // Save the modified value to the super admin configuration.
-
-                    AdminList.updateIndexLists(); // Update and refresh configuration.
-                    return true;
-                } else {
+            } else {
                     return false;
                 }
         } else {