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 31b9c7a..cab47de 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
@@ -32,7 +32,7 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/rest/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final AccountsRest LoginService = retrofit.create(AccountsRest.class);
@@ -52,7 +52,8 @@
                     @Override
                     public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
                         LoginJson loginJson =response.body();
-                        String token = loginJson.getToken();
+                        Amaryllis app = (Amaryllis) getApplication();
+                        app.setToken(loginJson.getToken());
                         Intent intent = new Intent(LoginActivity.this, MapsActivity.class);
                         startActivity(intent);
                     }
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 0c9c662..6e0447b 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
@@ -11,6 +11,7 @@
 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;
 
@@ -58,7 +59,11 @@
                 call.enqueue(new Callback<SignUpJson>(){
                     @Override
                     public void onResponse(Call<SignUpJson> call, Response<SignUpJson> response) {
-                        Intent intent = new Intent(SignUpActivity.this, LoginActivity.class);
+                        SignUpJson signUpJson =response.body();
+                        String token = signUpJson.getToken();
+                        Amaryllis amaryllis = (Amaryllis) getApplication();
+                        amaryllis.setToken(token);
+                        Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
                         startActivity(intent);
                     }
 
@@ -68,6 +73,14 @@
                 });
             }
         });
+       /* 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/SignUpJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java
index cc9a943..db33186 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java
@@ -3,6 +3,7 @@
 public class SignUpJson {
     private String message;
     private String uid;
+    private String token;
 
     public String getMessage() {
         return message;
@@ -19,4 +20,12 @@
     public void setUid(String uid) {
         this.uid = uid;
     }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
 }