diff --git a/build.gradle b/build.gradle
index d439492..284ac06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,8 @@
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     // a dependency on Jackson Databind
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.4'
-
+    
+    implementation 'io.vertx:vertx-core:3.5.3'
 }
 
 test {
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 518b2a1..68724ec 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
@@ -84,7 +84,7 @@
     public int createAccount(@FormParam("name") String name, @FormParam("email") String email, @FormParam("password") String password) {
 
         // パスワード, メアドが正しく入力されているかチェック
-        if (!isCorrectPassword(password) || !isCorrectEmailAddress(email))
+        if (!isCorrectPassword(password) || !isCorrectEmailAddress(email)||!isCorrectName(name))
             throw new WebApplicationException(401);
 
         // すでに同じメールアドレスが存在しているか
@@ -128,7 +128,16 @@
     private boolean isCorrectPassword(String password) {
         // password: 最低８文字以上の入力
         var passMinLen = 8;
-        return (passMinLen <= password.length());
+        var passMaxLen = 20;
+        return (passMinLen <= password.length()&& password.length()<=passMaxLen);
+    }
+    //-----------------------------------------------------------------
+    //正しく名前が入力されているか
+    //-----------------------------------------------------------------
+    private boolean isCorrectName(String name){
+        var nameMinLen = 1;
+        var nameMaxLen = 20;
+        return (nameMinLen<= name.length()&&name.length()<=nameMaxLen);
     }
     //-----------------------------------------------------------------
 
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 cf3ab3b..d26c884 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,9 +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 == null) throw new WebApplicationException(404);
         if (!searchAccount.getToken().equals(token)) throw new WebApplicationException(400);
+        if (searchAccount == null) throw new WebApplicationException(404);
 
         throw new WebApplicationException(200);
     }