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 5afa53f..d125da9 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
@@ -11,7 +11,6 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-import org.ntlab.amaryllis.client.entities.LoginJson;
 import org.ntlab.amaryllis.client.entities.SignUpJson;
 import org.ntlab.amaryllis.client.resources.AccountsRest;
 
@@ -24,8 +23,8 @@
 public class LoginActivity extends AppCompatActivity implements TextWatcher {
     TextView passWordTextView;
     EditText passWordEditText;
-    TextView uidTextView;
-    EditText uidEditText;
+    TextView nameTextView;
+    EditText nameText;
     Button loginButton;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -37,30 +36,32 @@
                 .build();
         final AccountsRest LoginService = retrofit.create(AccountsRest.class);
         setContentView(R.layout.activity_login);
+        nameText = (EditText) findViewById(R.id.name);
+        nameText.addTextChangedListener(this);
+        nameTextView = findViewById(R.id.name);
         passWordEditText = (EditText) findViewById(R.id.passWord);
         passWordEditText.addTextChangedListener(this);
         passWordTextView = findViewById(R.id.passWord);
-        uidEditText = (EditText) findViewById(R.id.uid);
-        uidEditText.addTextChangedListener(this);
-        uidTextView = findViewById(R.id.uid);
         loginButton = (Button)findViewById(R.id.login);
         loginButton.setEnabled(false);
-        uidEditText.setText( ((Amaryllis) getApplication()).getUid());
         loginButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-               Call<LoginJson> call = LoginService.accountLogin(uidEditText.getText().toString(),passWordEditText.getText().toString());
-                call.enqueue(new Callback<LoginJson>(){
+               Call<SignUpJson> call = LoginService.putAccounts(nameText.getText().toString(),passWordEditText.getText().toString());
+                call.enqueue(new Callback<SignUpJson>(){
                     @Override
-                    public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
-                        LoginJson loginJson =response.body();
+                    public void onResponse(Call<SignUpJson> call, Response<SignUpJson> response) {
+                        SignUpJson signUpJson =response.body();
                         Amaryllis app = (Amaryllis) getApplication();
-                        app.setToken(loginJson.getToken());
+                        app.setToken(signUpJson.getToken());
+                        app.setUid(nameText.getText().toString());
+                        app.setPassword(passWordEditText.getText().toString());
                         Intent intent = new Intent(LoginActivity.this, MainActivity.class);
                         startActivity(intent);
+                        finish();
                     }
 
                     @Override
-                    public void onFailure(Call<LoginJson> call, Throwable t) {
+                    public void onFailure(Call<SignUpJson> call, Throwable t) {
                     }
                 });
             }
@@ -80,7 +81,7 @@
 
     @Override
     public void afterTextChanged(Editable s) {
-        if(passWordTextView.length()>3 && uidTextView.length()>0 ){
+        if(passWordTextView.length()>3 && nameTextView.length()>0 ){
             loginButton.setEnabled(true);
         }
         else{
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
index a65d763..0be6295 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
@@ -201,7 +201,6 @@
 
     public void method() {
         Amaryllis amaryllis =(Amaryllis) getApplication();
-        amaryllis.setUid("");
         amaryllis.setPassword("");
     }
     public void logout(){
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
index ed0703b..7c34b9a 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
@@ -75,6 +75,7 @@
                         Amaryllis amaryllis = (Amaryllis) getApplication();
                         amaryllis.setToken(token);
                         amaryllis.setUid(signUpJson.getUid());
+                        amaryllis.setPassword(passWordEditText.getText().toString());
                         Intent intent = new Intent(SignUpActivity.this, MainActivity.class);
                         startActivity(intent);
                         finish();
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 1a549cb..3e5d2c0 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
@@ -52,7 +52,7 @@
     //アカウントのログイン
     @FormUrlEncoded
     @PUT("accounts")
-    Call<LoginJson> putAccounts(
+    Call<SignUpJson> putAccounts(
             @Field("name") String name,
             @Field("password") String password
     );
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 4d41f7e..2fe6f9f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -17,7 +17,7 @@
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.182" />
+        app:layout_constraintVertical_bias="0.418" />
 
     <Button
         android:id="@+id/login"
@@ -44,28 +44,27 @@
         app:layout_constraintVertical_bias="0.0" />
 
     <EditText
-        android:id="@+id/uid"
+        android:id="@+id/name"
         android:layout_width="199dp"
         android:layout_height="58dp"
         android:ems="10"
         android:inputType="textPersonName"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/passWord"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="@+id/passWord"
-        app:layout_constraintTop_toBottomOf="@+id/passWord"
-        app:layout_constraintVertical_bias="0.145" />
+        app:layout_constraintBottom_toTopOf="@+id/passWord"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.62" />
 
     <TextView
-        android:id="@+id/uidtext"
+        android:id="@+id/nametext"
         android:layout_width="47dp"
         android:layout_height="23dp"
-        android:text="uid"
-        app:layout_constraintBottom_toBottomOf="@+id/uid"
-        app:layout_constraintEnd_toStartOf="@+id/uid"
+        android:text="name"
+        app:layout_constraintBottom_toBottomOf="@+id/name"
+        app:layout_constraintEnd_toStartOf="@+id/name"
         app:layout_constraintHorizontal_bias="0.44"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/uid"
+        app:layout_constraintTop_toTopOf="@+id/name"
         app:layout_constraintVertical_bias="0.0" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>