diff --git a/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java b/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java
index c3076d4..28da7c6 100644
--- a/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java
@@ -29,16 +29,16 @@
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
             return insets;
         });
-        Button button_register = (Button) findViewById(R.id.Newregistationbutton);
-        button_register.setOnClickListener(new View.OnClickListener() {
+        Button registerButton = (Button) findViewById(R.id.Newregistationbutton);
+        registerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Intent intent = new Intent(LaunchActivity.this,RegisterActivity.class);
                 startActivity(intent);
             }
         });
-        button_register = (Button) findViewById(R.id.Loginbutton);
-        button_register.setOnClickListener(new View.OnClickListener() {
+        registerButton = (Button) findViewById(R.id.Loginbutton);
+        registerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Intent intent = new Intent(LaunchActivity.this,LoginActivity.class);
diff --git a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
index 759f6b6..2bcf88e 100644
--- a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
@@ -20,6 +20,7 @@
 
 public class RegisterActivity extends AppCompatActivity {
     private Tampopo tampopo;
+    private String userId, password;
     UserViewModel userViewModel;
 
     @Override
@@ -42,15 +43,25 @@
         EditText userIdEditText = findViewById(R.id.editTextUserId);
         EditText passwordEditText = findViewById(R.id.editTextPassword);
 
+        userViewModel.getUser().observe(this, user -> {
+            if (user != null) {
+                userViewModel.login(userId, password);
+
+//                Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
+//                startActivity(intent);
+//                finish();
+            } else {
+                Toast.makeText(RegisterActivity.this, "アカウント作成に失敗しました", Toast.LENGTH_SHORT).show();
+            }
+        });
 
         //登録
         Button registerButton = (Button) findViewById(R.id.Registerbutton);
         registerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                String userId = userIdEditText.getText().toString().trim();
-                String password = passwordEditText.getText().toString().trim();
-
+                userId = userIdEditText.getText().toString().trim();
+                password = passwordEditText.getText().toString().trim();
                 //空文字チェック
                 if (userId.isEmpty() || password.isEmpty()) {
                     Toast.makeText(RegisterActivity.this, "IDとパスワードを入力してください", Toast.LENGTH_SHORT).show();
@@ -63,17 +74,34 @@
 
                 //アカウントの確認、問題なければ通信
                 //if (userViewModel.getUser().getValue() != null) {
-                    userViewModel.login(userId, password);
+//                    userViewModel.login(userId, password);
                     tampopo.setUserId(userId);
                     tampopo.setPassword(password);
-                    Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
-                    startActivity(intent);
+//                    Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
+//                    startActivity(intent);
 //                } else {
 //                    Toast.makeText(RegisterActivity.this, "アカウント作成に失敗しました", Toast.LENGTH_SHORT).show();
 //                }
             }
         });
 
+        //トークン
+        userViewModel.getToken().observe(this, token -> {
+            if (token != null && !token.isEmpty()) {
+                // トークンをTampopoに保存
+                tampopo.setToken(token);
+                tampopo.setUserId(userIdEditText.getText().toString().trim());
+                tampopo.setPassword(passwordEditText.getText().toString().trim());
+
+                // 画面遷移
+                Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
+                startActivity(intent);
+                finish(); // 戻れないようにする
+            } else {
+                Toast.makeText(RegisterActivity.this, "トークン取得に失敗しました", Toast.LENGTH_SHORT).show();
+            }
+        });
+
         //ログイン画面へ
         Button loginButton = findViewById(R.id.Loginbutton2);
         loginButton.setOnClickListener(new View.OnClickListener() {