diff --git a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
index 7055b87..51964e4 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
@@ -47,7 +47,7 @@
         loginButton.setEnabled(false);
         loginButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-               Call<LoginJson> call = LoginService.putAccounts(passWordEditText.getText().toString(),uidEditText.getText().toString());
+               Call<LoginJson> call = LoginService.accountLogin(passWordEditText.getText().toString(),uidEditText.getText().toString(),"","");
                 call.enqueue(new Callback<LoginJson>(){
                     @Override
                     public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/Account.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/Account.java
index 5b850e4..c95934a 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/Account.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/Account.java
@@ -1,4 +1,63 @@
 package org.ntlab.amaryllis.client.entities;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
 public class Account {
+    private String uid;
+    private String name;
+    @JsonIgnore
+    private String token;
+    @JsonIgnore
+    private String password;
+    private String introduction;
+    private ArrayList<String> followings;
+    private ArrayList<String> followers;
+    private ArrayList<String> contributions;
+    private ArrayList<String> history;
+    public Account(String name, String password) {
+        this.name = name;
+        this.password = password;
+        this.uid = UUID.randomUUID().toString();
+        followings = new ArrayList<>();
+        followers = new ArrayList<>();
+        history = new ArrayList<>();
+        contributions = new ArrayList<>();
+        introduction = "";
+    }
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+    public String getUid() {
+        return uid;
+    }
+    public String getToken() {
+        return token;
+    }
+    public String getPassword() {
+        return password;
+    }
+    public ArrayList<String> getContributions() {
+        return contributions;
+    }
+    public ArrayList<String> getFollowers() {
+        return followers;
+    }
+    public ArrayList<String> getFollowings() {
+        return followings;
+    }
+    public ArrayList<String> getHistory() {
+        return history;
+    }
+    public String getIntroduction() {
+        return introduction;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setToken(String token) {
+        this.token = token;
+    }
 }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java
index 9d6dafb..3698467 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java
@@ -1,9 +1,15 @@
 package org.ntlab.amaryllis.client.entities;
 
+import java.util.UUID;
+
 public class LoginJson {
     private String message;
     private String token;
 
+    public LoginJson(String message){
+        this.message=message;
+        this.token= UUID.randomUUID().toString();
+    }
 
     public String getMessage(){
         return message;
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java
index a2853df..f1228f4 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java
@@ -12,6 +12,7 @@
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
+import retrofit2.http.Path;
 
 public interface AccountsRest {
 //追記
@@ -51,13 +52,13 @@
 //    )
 
     //アカウントのログイン
-//    @PUT("accounts/{uId}/login")
-//    Call<LoginJson> accountLogin(
-//            @Path("uId") String uId,
-//            @Field("password") String password,
-//            @Field("message") String message,
-//            @Field("token") String token
-//    );
+    @PUT("accounts/{uId}/login")
+    Call<LoginJson> accountLogin(
+            @Path("uId") String uId,
+            @Field("password") String password,
+            @Field("message") String message,
+            @Field("token") String token
+    );
 
 
     //指定アカウントのフォローを取得