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 cab47de..ca6fa98 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
@@ -45,9 +45,10 @@
         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(passWordEditText.getText().toString(),uidEditText.getText().toString());
+               Call<LoginJson> call = LoginService.accountLogin(uidEditText.getText().toString(),passWordEditText.getText().toString());
                 call.enqueue(new Callback<LoginJson>(){
                     @Override
                     public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
@@ -79,7 +80,7 @@
 
     @Override
     public void afterTextChanged(Editable s) {
-        if(passWordTextView.length()>7 && uidTextView.length()>0 ){
+        if(passWordTextView.length()>3 && uidTextView.length()>0 ){
             loginButton.setEnabled(true);
         }
         else{
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 8338abb..7f698a2 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
@@ -38,6 +38,14 @@
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final AccountsRest signUpService = retrofit.create(AccountsRest.class);
+        Amaryllis amaryllis =(Amaryllis) getApplication();
+        String uid = amaryllis.getUid();
+        String passWord = amaryllis.getPassword();
+        if(uid != null && passWord != null){
+            signUpService.accountLogin(uid,passWord);
+            Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
+            startActivity(intent);
+        }
         passWordEditText = (EditText) findViewById(R.id.passWord);
         passWordEditText.addTextChangedListener(this);
         passWordTextView = findViewById(R.id.passWord);
@@ -63,6 +71,7 @@
                         String token = signUpJson.getToken();
                         Amaryllis amaryllis = (Amaryllis) getApplication();
                         amaryllis.setToken(token);
+                        amaryllis.setUid(signUpJson.getUid());
                         Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
                         startActivity(intent);
                     }
@@ -73,14 +82,6 @@
                 });
             }
         });
-       /* Amaryllis amaryllis =(Amaryllis) getApplication();
-        String uid = amaryllis.getUid();
-        String passWord = amaryllis.getPassWord();
-        if(uid != null && passWord != null){
-            signUpService.accountLogin(uid,passWord);
-            Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
-            startActivity(intent);
-        }*/
 
     }
 
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 d4264c3..fcc1ef3 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
@@ -3,8 +3,22 @@
 import java.util.UUID;
 
 public class LoginJson {
+
     private String message;
+
+
     private String token;
+    public LoginJson(){
+
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
 
     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 83de421..1a549cb 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
@@ -72,6 +72,7 @@
     );
 
     //アカウントのログイン
+    @FormUrlEncoded
     @PUT("accounts/{uId}/login")
     Call<LoginJson> accountLogin(
             @Path("uId") String uId,