diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
index 1a454baf1..271800445 100644
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
@@ -159,13 +159,13 @@ public class PartyCommand implements CommandExecutor {
             return true;
 
         case 2:
-            if (!partyInstance.isParty(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
-                return true;
-            }
-
             if (PP.inParty()) {
                 if (args[0].equalsIgnoreCase("password")) {
+                    if (!partyInstance.isParty(args[1])) {
+                        sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
+                        return true;
+                    }
+
                     if (isLeader) {
                         if (!partyInstance.isPartyLocked(partyName)) {
                             partyInstance.lockParty(partyName);