diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java
index 68724ec..ed1bc6b 100644
--- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java
+++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java
@@ -128,16 +128,14 @@
     private boolean isCorrectPassword(String password) {
         // password: 最低８文字以上の入力
         var passMinLen = 8;
-        var passMaxLen = 20;
-        return (passMinLen <= password.length()&& password.length()<=passMaxLen);
+        return (passMinLen <= password.length());
     }
     //-----------------------------------------------------------------
     //正しく名前が入力されているか
     //-----------------------------------------------------------------
     private boolean isCorrectName(String name){
         var nameMinLen = 1;
-        var nameMaxLen = 20;
-        return (nameMinLen<= name.length()&&name.length()<=nameMaxLen);
+        return (nameMinLen<= name.length());
     }
     //-----------------------------------------------------------------
 
diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java
index d26c884..179a852 100644
--- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java
+++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java
@@ -23,8 +23,8 @@
     public boolean hasLoginToken(@QueryParam("uid") String uidStr, @QueryParam("token") String token) {
         var uid = Integer.parseInt(uidStr);
         var searchAccount = accounts.getAccountByUid(uid);
-        if (!searchAccount.getToken().equals(token)) throw new WebApplicationException(400);
         if (searchAccount == null) throw new WebApplicationException(404);
+        if (!searchAccount.getToken().equals(token)) throw new WebApplicationException(400);
 
         throw new WebApplicationException(200);
     }