diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Account.java b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
index f59afb1..7be09f3 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
@@ -21,19 +21,34 @@
 package org.ntlab.acanthus_server.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.UUID;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "name",
+        "email",
+        "work"
+})
+
+//
 public class Account {
 
-    private Integer uid;
+    @JsonProperty("name")
     private String name;
+    @JsonProperty("email")
     private String email;
+    @JsonProperty("work")
     private HashMap<Integer, Work> workHashMap = new HashMap<>();
 
     @JsonIgnore
+    private Integer uid;
+    @JsonIgnore
     private String token;
     @JsonIgnore
     private String password;
diff --git a/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java b/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java
index 0726e9c..2bb66cb 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java
@@ -1,9 +1,22 @@
 package org.ntlab.acanthus_server.entities;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "uid",
+        "token"
+})
+
 //-----------------------------------------------------------------
 // アカウント一覧取得用のJsonクラス
 public class AccountJson {
+
+    @JsonProperty("uid")
     private Integer uid;
+    @JsonProperty("name")
     private String name;
 
     //-----------------------------------------------------------------
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 1faf919..d909300 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
@@ -38,14 +38,15 @@
      */
     @PUT
     @Produces(MediaType.APPLICATION_JSON)
-    public void authenticateLoginToken(@FormParam("e-mail") String email, @FormParam("password") String password) {
+    public String authenticateLoginToken(@FormParam("email") String email, @FormParam("password") String password) {
 
         var searchAccount = accounts.getAccountByEmail(email);
 
-        if (searchAccount == null) throw new WebApplicationException(404);
+        if (searchAccount == null) throw new WebApplicationException(400);
         if (searchAccount.isMatchedPassword(password)) throw new WebApplicationException(401);
 
         searchAccount.updateToken();
+        return searchAccount.getToken();
     }
     //-----------------------------------------------------------